Add StakeState::serialized_size and static assertion

solana-labs · Apr 19, 2022 · dc0cc89 · dc0cc89
1 parent d6ff50b
commit dc0cc89
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 125 deletions.
diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs
@@ -2113,7 +2113,7 @@ impl RentLengthValue {
     pub fn length(&self) -> usize {
         match self {
             Self::Nonce => NonceState::size(),
-            Self::Stake => std::mem::size_of::<StakeState>(),
+            Self::Stake => StakeState::serialized_size(),
             Self::System => 0,
             Self::Vote => VoteState::size_of(),
             Self::Bytes(l) => *l,

diff --git a/cli/src/stake.rs b/cli/src/stake.rs
@@ -1310,7 +1310,7 @@ pub fn process_create_stake_account(
         }
 
         let minimum_balance =
-            rpc_client.get_minimum_balance_for_rent_exemption(std::mem::size_of::<StakeState>())?;
+            rpc_client.get_minimum_balance_for_rent_exemption(StakeState::serialized_size())?;
 
         if lamports < minimum_balance {
             return Err(CliError::BadParameter(format!(
@@ -1784,7 +1784,7 @@ pub fn process_split_stake(
         }
 
         let minimum_balance =
-            rpc_client.get_minimum_balance_for_rent_exemption(std::mem::size_of::<StakeState>())?;
+            rpc_client.get_minimum_balance_for_rent_exemption(StakeState::serialized_size())?;
 
         if lamports < minimum_balance {
             return Err(CliError::BadParameter(format!(

diff --git a/cli/tests/stake.rs b/cli/tests/stake.rs
@@ -1078,7 +1078,7 @@ fn test_stake_split() {
 
     // Create stake account, identity is authority
     let minimum_stake_balance = rpc_client
-        .get_minimum_balance_for_rent_exemption(std::mem::size_of::<StakeState>())
+        .get_minimum_balance_for_rent_exemption(StakeState::serialized_size())
         .unwrap();
     let stake_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
     let stake_account_pubkey = stake_keypair.pubkey();
@@ -1227,7 +1227,7 @@ fn test_stake_set_lockup() {
 
     // Create stake account, identity is authority
     let minimum_stake_balance = rpc_client
-        .get_minimum_balance_for_rent_exemption(std::mem::size_of::<StakeState>())
+        .get_minimum_balance_for_rent_exemption(StakeState::serialized_size())
         .unwrap();
 
     let stake_keypair = keypair_from_seed(&[0u8; 32]).unwrap();