feat: verifreg: serialize RemoveDataCapProposalID as tuple (#574)

Author: arajasek

actors/verifreg/src/lib.rs

@@ -730,13 +730,13 @@ where
         )
     })?;
 
-    let curr_id = if let Some(RemoveDataCapProposalID(id)) = maybe_id {
-        RemoveDataCapProposalID(*id)
+    let curr_id = if let Some(RemoveDataCapProposalID { id }) = maybe_id {
+        RemoveDataCapProposalID { id: *id }
     } else {
-        RemoveDataCapProposalID(0)
+        RemoveDataCapProposalID { id: 0 }
     };
 
-    let next_id = RemoveDataCapProposalID(curr_id.0 + 1);
+    let next_id = RemoveDataCapProposalID { id: curr_id.id + 1 };
     proposal_ids.set(BytesKey::from(key.to_bytes()), next_id).map_err(|e| {
         actor_error!(
             illegal_state,

actors/verifreg/src/types.rs

@@ -7,7 +7,6 @@ use fvm_shared::address::Address;
 use fvm_shared::bigint::bigint_ser;
 use fvm_shared::crypto::signature::Signature;
 use fvm_shared::sector::StoragePower;
-use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct VerifierParams {
@@ -66,9 +65,10 @@ pub struct RemoveDataCapReturn {
     pub data_cap_removed: DataCap,
 }
 
-#[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Eq)]
-#[serde(transparent)]
-pub struct RemoveDataCapProposalID(pub u64);
+#[derive(Clone, Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
+pub struct RemoveDataCapProposalID {
+    pub id: u64,
+}
 
 #[derive(Debug, Serialize_tuple, Deserialize_tuple)]
 pub struct RemoveDataCapProposal {

test_vm/tests/verifreg_remove_datacap_test.rs

@@ -104,7 +104,7 @@ fn remove_datacap_simple_successful_path() {
     let mut verifier1_proposal = RemoveDataCapProposal {
         verified_client: verified_client_id_addr,
         data_cap_amount: allowance_to_remove.clone(),
-        removal_proposal_id: RemoveDataCapProposalID(0),
+        removal_proposal_id: RemoveDataCapProposalID { id: 0 },
     };
 
     let mut verifier1_proposal_ser = to_vec(&verifier1_proposal).unwrap();
@@ -114,7 +114,7 @@ fn remove_datacap_simple_successful_path() {
     let mut verifier2_proposal = RemoveDataCapProposal {
         verified_client: verified_client_id_addr,
         data_cap_amount: allowance_to_remove.clone(),
-        removal_proposal_id: RemoveDataCapProposalID(0),
+        removal_proposal_id: RemoveDataCapProposalID { id: 0 },
     };
 
     let mut verifier2_proposal_ser = to_vec(&verifier2_proposal).unwrap();
@@ -185,14 +185,14 @@ fn remove_datacap_simple_successful_path() {
         .unwrap()
         .unwrap();
 
-    assert_eq!(1u64, verifier1_proposal_id.0);
+    assert_eq!(1u64, verifier1_proposal_id.id);
 
     let verifier2_proposal_id: &RemoveDataCapProposalID = proposal_ids
         .get(&AddrPairKey::new(verifier2_id_addr, verified_client_id_addr).to_bytes())
         .unwrap()
         .unwrap();
 
-    assert_eq!(1u64, verifier2_proposal_id.0);
+    assert_eq!(1u64, verifier2_proposal_id.id);
 
     // remove the second half of the client's allowance, this causes the client to be deleted
 
@@ -276,13 +276,13 @@ fn remove_datacap_simple_successful_path() {
         .unwrap()
         .unwrap();
 
-    assert_eq!(2u64, verifier1_proposal_id.0);
+    assert_eq!(2u64, verifier1_proposal_id.id);
 
     let verifier2_proposal_id: &RemoveDataCapProposalID = proposal_ids
         .get(&AddrPairKey::new(verifier2_id_addr, verified_client_id_addr).to_bytes())
         .unwrap()
         .unwrap();
 
-    assert_eq!(2u64, verifier2_proposal_id.0);
+    assert_eq!(2u64, verifier2_proposal_id.id);
     v.assert_state_invariants();
 }