gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get rid of Accounts new and default (#19100)

Browse Source
This commit is contained in:
Jeff Washington (jwash)
2021-08-06 15:52:27 -05:00
committed by GitHub
parent 216a1b3d74
commit f771063275
2 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/src/accounts.rs
View File

@ -97,15 +97,6 @@ pub struct Accounts {
pub(crate) account_locks: Mutex<AccountLocks>, pub(crate) account_locks: Mutex<AccountLocks>,
} }
impl Default for Accounts {
fn default() -> Self {
Self {
accounts_db: Arc::new(AccountsDb::default()),
account_locks: Mutex::default(),
}
}
}
// for the load instructions // for the load instructions
pub type TransactionAccounts = Vec<(Pubkey, AccountSharedData)>; pub type TransactionAccounts = Vec<(Pubkey, AccountSharedData)>;
pub type TransactionRent = u64; pub type TransactionRent = u64;
@ -133,20 +124,6 @@ impl Accounts {
} }
} }
pub fn new(
paths: Vec<PathBuf>,
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( pub fn new_with_config_for_benches(
paths: Vec<PathBuf>, paths: Vec<PathBuf>,
cluster_type: &ClusterType, cluster_type: &ClusterType,

18
runtime/src/message_processor.rs
View File

@ -1375,7 +1375,7 @@ mod tests {
Rc::new(RefCell::new(Executors::default())), Rc::new(RefCell::new(Executors::default())),
None, None,
Arc::new(FeatureSet::all_enabled()), Arc::new(FeatureSet::all_enabled()),
Arc::new(Accounts::default()), Arc::new(Accounts::default_for_tests()),
&ancestors, &ancestors,
&blockhash, &blockhash,
&fee_calculator, &fee_calculator,
@ -1989,7 +1989,7 @@ mod tests {
ComputeBudget::new(), ComputeBudget::new(),
Rc::new(RefCell::new(MockComputeMeter::default())), Rc::new(RefCell::new(MockComputeMeter::default())),
&mut ExecuteDetailsTimings::default(), &mut ExecuteDetailsTimings::default(),
Arc::new(Accounts::default()), Arc::new(Accounts::default_for_tests()),
&ancestors, &ancestors,
Hash::default(), Hash::default(),
FeeCalculator::default(), FeeCalculator::default(),
@ -2019,7 +2019,7 @@ mod tests {
ComputeBudget::new(), ComputeBudget::new(),
Rc::new(RefCell::new(MockComputeMeter::default())), Rc::new(RefCell::new(MockComputeMeter::default())),
&mut ExecuteDetailsTimings::default(), &mut ExecuteDetailsTimings::default(),
Arc::new(Accounts::default()), Arc::new(Accounts::default_for_tests()),
&ancestors, &ancestors,
Hash::default(), Hash::default(),
FeeCalculator::default(), FeeCalculator::default(),
@ -2053,7 +2053,7 @@ mod tests {
ComputeBudget::new(), ComputeBudget::new(),
Rc::new(RefCell::new(MockComputeMeter::default())), Rc::new(RefCell::new(MockComputeMeter::default())),
&mut ExecuteDetailsTimings::default(), &mut ExecuteDetailsTimings::default(),
Arc::new(Accounts::default()), Arc::new(Accounts::default_for_tests()),
&ancestors, &ancestors,
Hash::default(), Hash::default(),
FeeCalculator::default(), FeeCalculator::default(),
@ -2179,7 +2179,7 @@ mod tests {
ComputeBudget::new(), ComputeBudget::new(),
Rc::new(RefCell::new(MockComputeMeter::default())), Rc::new(RefCell::new(MockComputeMeter::default())),
&mut ExecuteDetailsTimings::default(), &mut ExecuteDetailsTimings::default(),
Arc::new(Accounts::default()), Arc::new(Accounts::default_for_tests()),
&ancestors, &ancestors,
Hash::default(), Hash::default(),
FeeCalculator::default(), FeeCalculator::default(),
@ -2213,7 +2213,7 @@ mod tests {
ComputeBudget::new(), ComputeBudget::new(),
Rc::new(RefCell::new(MockComputeMeter::default())), Rc::new(RefCell::new(MockComputeMeter::default())),
&mut ExecuteDetailsTimings::default(), &mut ExecuteDetailsTimings::default(),
Arc::new(Accounts::default()), Arc::new(Accounts::default_for_tests()),
&ancestors, &ancestors,
Hash::default(), Hash::default(),
FeeCalculator::default(), FeeCalculator::default(),
@ -2245,7 +2245,7 @@ mod tests {
ComputeBudget::new(), ComputeBudget::new(),
Rc::new(RefCell::new(MockComputeMeter::default())), Rc::new(RefCell::new(MockComputeMeter::default())),
&mut ExecuteDetailsTimings::default(), &mut ExecuteDetailsTimings::default(),
Arc::new(Accounts::default()), Arc::new(Accounts::default_for_tests()),
&ancestors, &ancestors,
Hash::default(), Hash::default(),
FeeCalculator::default(), FeeCalculator::default(),
@ -2353,7 +2353,7 @@ mod tests {
Rc::new(RefCell::new(Executors::default())), Rc::new(RefCell::new(Executors::default())),
None, None,
Arc::new(FeatureSet::all_enabled()), Arc::new(FeatureSet::all_enabled()),
Arc::new(Accounts::default()), Arc::new(Accounts::default_for_tests()),
&ancestors, &ancestors,
&blockhash, &blockhash,
&fee_calculator, &fee_calculator,
@ -2414,7 +2414,7 @@ mod tests {
Rc::new(RefCell::new(Executors::default())), Rc::new(RefCell::new(Executors::default())),
None, None,
Arc::new(FeatureSet::all_enabled()), Arc::new(FeatureSet::all_enabled()),
Arc::new(Accounts::default()), Arc::new(Accounts::default_for_tests()),
&ancestors, &ancestors,
&blockhash, &blockhash,
&fee_calculator, &fee_calculator,