From 5c69af607dd34f91b82364342e1ff49283cd4b19 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 8 Feb 2022 16:45:22 +0000 Subject: [PATCH] Put accounts data len updates behind feature gate (#22918) (#23007) (cherry picked from commit f0f4042680132f6e6d94b8db46daa12cf61a2466) Co-authored-by: Brooks Prumo --- runtime/src/bank.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 09a6e1a2ac..a2cf92f95b 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -4671,7 +4671,11 @@ impl Bank { .write() .unwrap() .extend(rent_debits.into_unordered_rewards_iter()); - if total_collected.account_data_len_reclaimed > 0 { + if self + .feature_set + .is_active(&feature_set::cap_accounts_data_len::id()) + && total_collected.account_data_len_reclaimed > 0 + { self.update_accounts_data_len(-(total_collected.account_data_len_reclaimed as i64)); } @@ -15757,7 +15761,7 @@ pub(crate) mod tests { solana_logger::setup(); let (genesis_config, mint_keypair) = create_genesis_config(1_000_000_000_000); let mut bank = Bank::new_for_tests(&genesis_config); - bank.activate_feature(&solana_sdk::feature_set::cap_accounts_data_len::id()); + bank.activate_feature(&feature_set::cap_accounts_data_len::id()); let mut i = 0; let result = loop {