diff --git a/runtime/src/accounts.rs b/runtime/src/accounts.rs index 85633a21c4..93be48170a 100644 --- a/runtime/src/accounts.rs +++ b/runtime/src/accounts.rs @@ -97,15 +97,6 @@ pub struct Accounts { pub(crate) account_locks: Mutex, } -impl Default for Accounts { - fn default() -> Self { - Self { - accounts_db: Arc::new(AccountsDb::default()), - account_locks: Mutex::default(), - } - } -} - // for the load instructions pub type TransactionAccounts = Vec<(Pubkey, AccountSharedData)>; pub type TransactionRent = u64; @@ -133,20 +124,6 @@ impl Accounts { } } - pub fn new( - paths: Vec, - cluster_type: &ClusterType, - shrink_ratio: AccountShrinkThreshold, - ) -> Self { - Self::new_with_config( - paths, - cluster_type, - AccountSecondaryIndexes::default(), - false, - shrink_ratio, - ) - } - pub fn new_with_config_for_benches( paths: Vec, cluster_type: &ClusterType, diff --git a/runtime/src/message_processor.rs b/runtime/src/message_processor.rs index 1c37bf47c6..32acb5c5ee 100644 --- a/runtime/src/message_processor.rs +++ b/runtime/src/message_processor.rs @@ -1375,7 +1375,7 @@ mod tests { Rc::new(RefCell::new(Executors::default())), None, Arc::new(FeatureSet::all_enabled()), - Arc::new(Accounts::default()), + Arc::new(Accounts::default_for_tests()), &ancestors, &blockhash, &fee_calculator, @@ -1989,7 +1989,7 @@ mod tests { ComputeBudget::new(), Rc::new(RefCell::new(MockComputeMeter::default())), &mut ExecuteDetailsTimings::default(), - Arc::new(Accounts::default()), + Arc::new(Accounts::default_for_tests()), &ancestors, Hash::default(), FeeCalculator::default(), @@ -2019,7 +2019,7 @@ mod tests { ComputeBudget::new(), Rc::new(RefCell::new(MockComputeMeter::default())), &mut ExecuteDetailsTimings::default(), - Arc::new(Accounts::default()), + Arc::new(Accounts::default_for_tests()), &ancestors, Hash::default(), FeeCalculator::default(), @@ -2053,7 +2053,7 @@ mod tests { ComputeBudget::new(), Rc::new(RefCell::new(MockComputeMeter::default())), &mut ExecuteDetailsTimings::default(), - Arc::new(Accounts::default()), + Arc::new(Accounts::default_for_tests()), &ancestors, Hash::default(), FeeCalculator::default(), @@ -2179,7 +2179,7 @@ mod tests { ComputeBudget::new(), Rc::new(RefCell::new(MockComputeMeter::default())), &mut ExecuteDetailsTimings::default(), - Arc::new(Accounts::default()), + Arc::new(Accounts::default_for_tests()), &ancestors, Hash::default(), FeeCalculator::default(), @@ -2213,7 +2213,7 @@ mod tests { ComputeBudget::new(), Rc::new(RefCell::new(MockComputeMeter::default())), &mut ExecuteDetailsTimings::default(), - Arc::new(Accounts::default()), + Arc::new(Accounts::default_for_tests()), &ancestors, Hash::default(), FeeCalculator::default(), @@ -2245,7 +2245,7 @@ mod tests { ComputeBudget::new(), Rc::new(RefCell::new(MockComputeMeter::default())), &mut ExecuteDetailsTimings::default(), - Arc::new(Accounts::default()), + Arc::new(Accounts::default_for_tests()), &ancestors, Hash::default(), FeeCalculator::default(), @@ -2353,7 +2353,7 @@ mod tests { Rc::new(RefCell::new(Executors::default())), None, Arc::new(FeatureSet::all_enabled()), - Arc::new(Accounts::default()), + Arc::new(Accounts::default_for_tests()), &ancestors, &blockhash, &fee_calculator, @@ -2414,7 +2414,7 @@ mod tests { Rc::new(RefCell::new(Executors::default())), None, Arc::new(FeatureSet::all_enabled()), - Arc::new(Accounts::default()), + Arc::new(Accounts::default_for_tests()), &ancestors, &blockhash, &fee_calculator,