blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removes cluster_type from AccountsPackage (#28725)

This commit is contained in:
Brooks Prumo 2022-11-02 18:21:13 -04:00 committed by GitHub
parent 3e395394d2
commit 064cfc70d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/accounts_hash_verifier.rs
View File

@ -469,7 +469,6 @@ mod tests {
rand::seq::SliceRandom, rand::seq::SliceRandom,
solana_gossip::{cluster_info::make_accounts_hashes_message, contact_info::ContactInfo}, solana_gossip::{cluster_info::make_accounts_hashes_message, contact_info::ContactInfo},
solana_sdk::{ solana_sdk::{
genesis_config::ClusterType,
hash::hash, hash::hash,
signature::{Keypair, Signer}, signature::{Keypair, Signer},
}, },
@ -543,7 +542,6 @@ mod tests {
package_type: AccountsPackageType::AccountsHashVerifier, package_type: AccountsPackageType::AccountsHashVerifier,
slot: full_snapshot_archive_interval_slots + i as u64, slot: full_snapshot_archive_interval_slots + i as u64,
block_height: full_snapshot_archive_interval_slots + i as u64, block_height: full_snapshot_archive_interval_slots + i as u64,
cluster_type: ClusterType::MainnetBeta,
accounts: Arc::clone(&accounts), accounts: Arc::clone(&accounts),
..AccountsPackage::default_for_tests() ..AccountsPackage::default_for_tests()
}; };

7
runtime/src/snapshot_package.rs
View File

@ -12,9 +12,7 @@ use {
}, },
}, },
log::*, log::*,
solana_sdk::{ solana_sdk::{clock::Slot, hash::Hash, sysvar::epoch_schedule::EpochSchedule},
clock::Slot, genesis_config::ClusterType, hash::Hash, sysvar::epoch_schedule::EpochSchedule,
},
std::{ std::{
fs, fs,
path::{Path, PathBuf}, path::{Path, PathBuf},
@ -44,7 +42,6 @@ pub struct AccountsPackage {
pub incremental_snapshot_archives_dir: PathBuf, pub incremental_snapshot_archives_dir: PathBuf,
pub expected_capitalization: u64, pub expected_capitalization: u64,
pub accounts_hash_for_testing: Option<Hash>, pub accounts_hash_for_testing: Option<Hash>,
pub cluster_type: ClusterType,
pub accounts: Arc<Accounts>, pub accounts: Arc<Accounts>,
pub epoch_schedule: EpochSchedule, pub epoch_schedule: EpochSchedule,
pub rent_collector: RentCollector, pub rent_collector: RentCollector,
@ -118,7 +115,6 @@ impl AccountsPackage {
.to_path_buf(), .to_path_buf(),
expected_capitalization: bank.capitalization(), expected_capitalization: bank.capitalization(),
accounts_hash_for_testing, accounts_hash_for_testing,
cluster_type: bank.cluster_type(),
accounts: bank.accounts(), accounts: bank.accounts(),
epoch_schedule: *bank.epoch_schedule(), epoch_schedule: *bank.epoch_schedule(),
rent_collector: bank.rent_collector().clone(), rent_collector: bank.rent_collector().clone(),
@ -142,7 +138,6 @@ impl AccountsPackage {
incremental_snapshot_archives_dir: PathBuf::default(), incremental_snapshot_archives_dir: PathBuf::default(),
expected_capitalization: u64::default(), expected_capitalization: u64::default(),
accounts_hash_for_testing: Option::default(), accounts_hash_for_testing: Option::default(),
cluster_type: ClusterType::Development,
accounts: Arc::new(Accounts::default_for_tests()), accounts: Arc::new(Accounts::default_for_tests()),
epoch_schedule: EpochSchedule::default(), epoch_schedule: EpochSchedule::default(),
rent_collector: RentCollector::default(), rent_collector: RentCollector::default(),