From d3690ddfc37ec0b8b0f5560fdfb8e1db0ee67304 Mon Sep 17 00:00:00 2001 From: Brooks Date: Mon, 8 Jan 2024 19:21:02 -0500 Subject: [PATCH] Removes unnecessary feature activation when testing accounts data size (#34701) --- runtime/src/bank/tests.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/runtime/src/bank/tests.rs b/runtime/src/bank/tests.rs index b31706b6ec..517102bf4f 100644 --- a/runtime/src/bank/tests.rs +++ b/runtime/src/bank/tests.rs @@ -10223,9 +10223,8 @@ fn test_transaction_log_collector_get_logs_for_address() { #[test] fn test_accounts_data_size_with_good_transaction() { const ACCOUNT_SIZE: u64 = MAX_PERMITTED_DATA_LENGTH; - let (genesis_config, mint_keypair) = create_genesis_config(sol_to_lamports(1_000.)); - let mut bank = Bank::new_for_tests(&genesis_config); - bank.activate_feature(&feature_set::cap_accounts_data_len::id()); + let (genesis_config, mint_keypair) = create_genesis_config(1_000 * LAMPORTS_PER_SOL); + let bank = Bank::new_for_tests(&genesis_config); let bank = bank.wrap_with_bank_forks_for_tests().0; let transaction = system_transaction::create_account( &mint_keypair, @@ -10265,8 +10264,9 @@ fn test_accounts_data_size_with_good_transaction() { #[test] fn test_accounts_data_size_with_bad_transaction() { const ACCOUNT_SIZE: u64 = MAX_PERMITTED_DATA_LENGTH; - let mut bank = create_simple_test_bank(1_000_000_000_000); - bank.activate_feature(&feature_set::cap_accounts_data_len::id()); + let (genesis_config, _mint_keypair) = create_genesis_config(1_000 * LAMPORTS_PER_SOL); + let bank = Bank::new_for_tests(&genesis_config); + let bank = bank.wrap_with_bank_forks_for_tests().0; let transaction = system_transaction::create_account( &Keypair::new(), &Keypair::new(), @@ -10276,8 +10276,6 @@ fn test_accounts_data_size_with_bad_transaction() { &solana_sdk::system_program::id(), ); - let bank = bank.wrap_with_bank_forks_for_tests().0; - let accounts_data_size_before = bank.load_accounts_data_size(); let accounts_data_size_delta_before = bank.load_accounts_data_size_delta(); let accounts_data_size_delta_on_chain_before = bank.load_accounts_data_size_delta_on_chain();