From 1a8e45dae01a00bff5c28100722d6e145b796a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Mei=C3=9Fner?= Date: Wed, 15 Nov 2023 16:52:42 +0100 Subject: [PATCH] Removes programs_updated_only_for_global_cache. --- accounts-db/src/accounts.rs | 1 - accounts-db/src/transaction_results.rs | 1 - program-runtime/src/invoke_context.rs | 5 ----- program-runtime/src/message_processor.rs | 16 ---------------- runtime/src/bank.rs | 11 ----------- runtime/src/bank/tests.rs | 1 - 6 files changed, 35 deletions(-) diff --git a/accounts-db/src/accounts.rs b/accounts-db/src/accounts.rs index 980a09735ab8e8..0b7c04276f83f7 100644 --- a/accounts-db/src/accounts.rs +++ b/accounts-db/src/accounts.rs @@ -1459,7 +1459,6 @@ mod tests { accounts_data_len_delta: 0, }, programs_modified_by_tx: Box::::default(), - programs_updated_only_for_global_cache: Box::::default(), } } diff --git a/accounts-db/src/transaction_results.rs b/accounts-db/src/transaction_results.rs index 7a6401d62d7a04..46e59cd4c60b51 100644 --- a/accounts-db/src/transaction_results.rs +++ b/accounts-db/src/transaction_results.rs @@ -34,7 +34,6 @@ pub enum TransactionExecutionResult { Executed { details: TransactionExecutionDetails, programs_modified_by_tx: Box, - programs_updated_only_for_global_cache: Box, }, NotExecuted(TransactionError), } diff --git a/program-runtime/src/invoke_context.rs b/program-runtime/src/invoke_context.rs index db736722f834a5..eaee493bbfb9d7 100644 --- a/program-runtime/src/invoke_context.rs +++ b/program-runtime/src/invoke_context.rs @@ -167,7 +167,6 @@ pub struct InvokeContext<'a> { accounts_data_meter: AccountsDataMeter, pub programs_loaded_for_tx_batch: &'a LoadedProgramsForTxBatch, pub programs_modified_by_tx: &'a mut LoadedProgramsForTxBatch, - pub programs_updated_only_for_global_cache: &'a mut LoadedProgramsForTxBatch, pub feature_set: Arc, pub timings: ExecuteDetailsTimings, pub blockhash: Hash, @@ -185,7 +184,6 @@ impl<'a> InvokeContext<'a> { compute_budget: ComputeBudget, programs_loaded_for_tx_batch: &'a LoadedProgramsForTxBatch, programs_modified_by_tx: &'a mut LoadedProgramsForTxBatch, - programs_updated_only_for_global_cache: &'a mut LoadedProgramsForTxBatch, feature_set: Arc, blockhash: Hash, lamports_per_signature: u64, @@ -201,7 +199,6 @@ impl<'a> InvokeContext<'a> { accounts_data_meter: AccountsDataMeter::new(prev_accounts_data_len), programs_loaded_for_tx_batch, programs_modified_by_tx, - programs_updated_only_for_global_cache, feature_set, timings: ExecuteDetailsTimings::default(), blockhash, @@ -688,7 +685,6 @@ macro_rules! with_mock_invoke_context { }); let programs_loaded_for_tx_batch = LoadedProgramsForTxBatch::default(); let mut programs_modified_by_tx = LoadedProgramsForTxBatch::default(); - let mut programs_updated_only_for_global_cache = LoadedProgramsForTxBatch::default(); let mut $invoke_context = InvokeContext::new( &mut $transaction_context, &sysvar_cache, @@ -696,7 +692,6 @@ macro_rules! with_mock_invoke_context { compute_budget, &programs_loaded_for_tx_batch, &mut programs_modified_by_tx, - &mut programs_updated_only_for_global_cache, Arc::new(FeatureSet::all_enabled()), Hash::default(), 0, diff --git a/program-runtime/src/message_processor.rs b/program-runtime/src/message_processor.rs index e3a0dabd8d07bf..c086a6389c0470 100644 --- a/program-runtime/src/message_processor.rs +++ b/program-runtime/src/message_processor.rs @@ -56,7 +56,6 @@ impl MessageProcessor { log_collector: Option>>, programs_loaded_for_tx_batch: &LoadedProgramsForTxBatch, programs_modified_by_tx: &mut LoadedProgramsForTxBatch, - programs_updated_only_for_global_cache: &mut LoadedProgramsForTxBatch, feature_set: Arc, compute_budget: ComputeBudget, timings: &mut ExecuteTimings, @@ -73,7 +72,6 @@ impl MessageProcessor { compute_budget, programs_loaded_for_tx_batch, programs_modified_by_tx, - programs_updated_only_for_global_cache, feature_set, blockhash, lamports_per_signature, @@ -302,7 +300,6 @@ mod tests { ))); let sysvar_cache = SysvarCache::default(); let mut programs_modified_by_tx = LoadedProgramsForTxBatch::default(); - let mut programs_updated_only_for_global_cache = LoadedProgramsForTxBatch::default(); let result = MessageProcessor::process_message( &message, &program_indices, @@ -310,7 +307,6 @@ mod tests { None, &programs_loaded_for_tx_batch, &mut programs_modified_by_tx, - &mut programs_updated_only_for_global_cache, Arc::new(FeatureSet::all_enabled()), ComputeBudget::default(), &mut ExecuteTimings::default(), @@ -354,7 +350,6 @@ mod tests { ]), ))); let mut programs_modified_by_tx = LoadedProgramsForTxBatch::default(); - let mut programs_updated_only_for_global_cache = LoadedProgramsForTxBatch::default(); let result = MessageProcessor::process_message( &message, &program_indices, @@ -362,7 +357,6 @@ mod tests { None, &programs_loaded_for_tx_batch, &mut programs_modified_by_tx, - &mut programs_updated_only_for_global_cache, Arc::new(FeatureSet::all_enabled()), ComputeBudget::default(), &mut ExecuteTimings::default(), @@ -396,7 +390,6 @@ mod tests { ]), ))); let mut programs_modified_by_tx = LoadedProgramsForTxBatch::default(); - let mut programs_updated_only_for_global_cache = LoadedProgramsForTxBatch::default(); let result = MessageProcessor::process_message( &message, &program_indices, @@ -404,7 +397,6 @@ mod tests { None, &programs_loaded_for_tx_batch, &mut programs_modified_by_tx, - &mut programs_updated_only_for_global_cache, Arc::new(FeatureSet::all_enabled()), ComputeBudget::default(), &mut ExecuteTimings::default(), @@ -528,7 +520,6 @@ mod tests { ))); let sysvar_cache = SysvarCache::default(); let mut programs_modified_by_tx = LoadedProgramsForTxBatch::default(); - let mut programs_updated_only_for_global_cache = LoadedProgramsForTxBatch::default(); let result = MessageProcessor::process_message( &message, &program_indices, @@ -536,7 +527,6 @@ mod tests { None, &programs_loaded_for_tx_batch, &mut programs_modified_by_tx, - &mut programs_updated_only_for_global_cache, Arc::new(FeatureSet::all_enabled()), ComputeBudget::default(), &mut ExecuteTimings::default(), @@ -564,7 +554,6 @@ mod tests { Some(transaction_context.get_key_of_account_at_index(0).unwrap()), ))); let mut programs_modified_by_tx = LoadedProgramsForTxBatch::default(); - let mut programs_updated_only_for_global_cache = LoadedProgramsForTxBatch::default(); let result = MessageProcessor::process_message( &message, &program_indices, @@ -572,7 +561,6 @@ mod tests { None, &programs_loaded_for_tx_batch, &mut programs_modified_by_tx, - &mut programs_updated_only_for_global_cache, Arc::new(FeatureSet::all_enabled()), ComputeBudget::default(), &mut ExecuteTimings::default(), @@ -597,7 +585,6 @@ mod tests { Some(transaction_context.get_key_of_account_at_index(0).unwrap()), ))); let mut programs_modified_by_tx = LoadedProgramsForTxBatch::default(); - let mut programs_updated_only_for_global_cache = LoadedProgramsForTxBatch::default(); let result = MessageProcessor::process_message( &message, &program_indices, @@ -605,7 +592,6 @@ mod tests { None, &programs_loaded_for_tx_batch, &mut programs_modified_by_tx, - &mut programs_updated_only_for_global_cache, Arc::new(FeatureSet::all_enabled()), ComputeBudget::default(), &mut ExecuteTimings::default(), @@ -687,7 +673,6 @@ mod tests { Arc::new(LoadedProgram::new_builtin(0, 0, MockBuiltin::vm)), ); let mut programs_modified_by_tx = LoadedProgramsForTxBatch::default(); - let mut programs_updated_only_for_global_cache = LoadedProgramsForTxBatch::default(); let result = MessageProcessor::process_message( &message, &[vec![0], vec![1]], @@ -695,7 +680,6 @@ mod tests { None, &programs_loaded_for_tx_batch, &mut programs_modified_by_tx, - &mut programs_updated_only_for_global_cache, Arc::new(FeatureSet::all_enabled()), ComputeBudget::default(), &mut ExecuteTimings::default(), diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 0dbb510d1b7341..61d8402b724422 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -4911,10 +4911,6 @@ impl Bank { self.slot, programs_loaded_for_tx_batch.environments.clone(), ); - let mut programs_updated_only_for_global_cache = LoadedProgramsForTxBatch::new( - self.slot, - programs_loaded_for_tx_batch.environments.clone(), - ); let mut process_message_time = Measure::start("process_message_time"); let process_result = MessageProcessor::process_message( tx.message(), @@ -4923,7 +4919,6 @@ impl Bank { log_collector.clone(), programs_loaded_for_tx_batch, &mut programs_modified_by_tx, - &mut programs_updated_only_for_global_cache, self.feature_set.clone(), compute_budget, timings, @@ -5023,9 +5018,6 @@ impl Bank { accounts_data_len_delta, }, programs_modified_by_tx: Box::new(programs_modified_by_tx), - programs_updated_only_for_global_cache: Box::new( - programs_updated_only_for_global_cache, - ), } } @@ -5308,7 +5300,6 @@ impl Bank { if let TransactionExecutionResult::Executed { details, programs_modified_by_tx, - programs_updated_only_for_global_cache: _, } = &result { // Update batch specific cache of the loaded programs with the modifications @@ -5685,13 +5676,11 @@ impl Bank { if let TransactionExecutionResult::Executed { details, programs_modified_by_tx, - programs_updated_only_for_global_cache, } = execution_result { if details.status.is_ok() { let mut cache = self.loaded_programs_cache.write().unwrap(); cache.merge(programs_modified_by_tx); - cache.merge(programs_updated_only_for_global_cache); } } } diff --git a/runtime/src/bank/tests.rs b/runtime/src/bank/tests.rs index 50d68c6cd82288..dcbf8065010bc9 100644 --- a/runtime/src/bank/tests.rs +++ b/runtime/src/bank/tests.rs @@ -204,7 +204,6 @@ fn new_execution_result( accounts_data_len_delta: 0, }, programs_modified_by_tx: Box::::default(), - programs_updated_only_for_global_cache: Box::::default(), } }