From 3993cd765c02d82880892c1dc1ffd9e7f451f724 Mon Sep 17 00:00:00 2001 From: Brooks Prumo Date: Wed, 26 Jan 2022 18:42:44 -0500 Subject: [PATCH] Remove rewrite_rent_exempt_reserve() (#22741) --- programs/stake/src/stake_state.rs | 35 ------------------------------- sdk/program/src/stake/state.rs | 18 ---------------- 2 files changed, 53 deletions(-) diff --git a/programs/stake/src/stake_state.rs b/programs/stake/src/stake_state.rs index 0d163f281e..27491d4fce 100644 --- a/programs/stake/src/stake_state.rs +++ b/programs/stake/src/stake_state.rs @@ -5676,41 +5676,6 @@ mod tests { ); } - #[test] - fn test_meta_rewrite_rent_exempt_reserve() { - let right_data_len = std::mem::size_of::() as u64; - let rent = Rent::default(); - let expected_rent_exempt_reserve = rent.minimum_balance(right_data_len as usize); - - let test_cases = [ - ( - right_data_len + 100, - Some(( - rent.minimum_balance(right_data_len as usize + 100), - expected_rent_exempt_reserve, - )), - ), // large data_len, too small rent exempt - (right_data_len, None), // correct - ( - right_data_len - 100, - Some(( - rent.minimum_balance(right_data_len as usize - 100), - expected_rent_exempt_reserve, - )), - ), // small data_len, too large rent exempt - ]; - for (data_len, expected_rewrite) in &test_cases { - let rent_exempt_reserve = rent.minimum_balance(*data_len as usize); - let mut meta = Meta { - rent_exempt_reserve, - ..Meta::default() - }; - let actual_rewrite = meta.rewrite_rent_exempt_reserve(&rent, right_data_len as usize); - assert_eq!(actual_rewrite, *expected_rewrite); - assert_eq!(meta.rent_exempt_reserve, expected_rent_exempt_reserve); - } - } - #[test] fn test_calculate_lamports_per_byte_year() { let rent = Rent::default(); diff --git a/sdk/program/src/stake/state.rs b/sdk/program/src/stake/state.rs index 4b73c0cf3f..5b34634271 100644 --- a/sdk/program/src/stake/state.rs +++ b/sdk/program/src/stake/state.rs @@ -280,24 +280,6 @@ impl Meta { Ok(()) } - pub fn rewrite_rent_exempt_reserve( - &mut self, - rent: &Rent, - data_len: usize, - ) -> Option<(u64, u64)> { - let corrected_rent_exempt_reserve = rent.minimum_balance(data_len); - if corrected_rent_exempt_reserve != self.rent_exempt_reserve { - // We forcibly update rent_excempt_reserve even - // if rent_exempt_reserve > account_balance, hoping user might restore - // rent_exempt status by depositing. - let (old, new) = (self.rent_exempt_reserve, corrected_rent_exempt_reserve); - self.rent_exempt_reserve = corrected_rent_exempt_reserve; - Some((old, new)) - } else { - None - } - } - pub fn auto(authorized: &Pubkey) -> Self { Self { authorized: Authorized::auto(authorized),