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

Revert "Add LastFullSnapshotSlot to SnapshotConfig (#19341)" (#19529)

Browse Source 
This reverts commit 4d361af976.
This commit is contained in:
Brooks Prumo
2021-08-31 22:03:19 -05:00
committed by GitHub
parent 2df96cd81e
commit 1d5a8ebc6a
10 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/accounts_hash_verifier.rs
View File

@ -271,10 +271,7 @@ impl AccountsHashVerifier {
mod tests {
use super::*;
use solana_gossip::{cluster_info::make_accounts_hashes_message, contact_info::ContactInfo};
use solana_runtime::{
snapshot_config::LastFullSnapshotSlot,
snapshot_utils::{ArchiveFormat, SnapshotVersion},
};
use solana_runtime::snapshot_utils::{ArchiveFormat, SnapshotVersion};
use solana_sdk::{
genesis_config::ClusterType,
hash::hash,
@ -346,7 +343,6 @@ mod tests {
archive_format: ArchiveFormat::Tar,
snapshot_version: SnapshotVersion::default(),
maximum_snapshots_to_retain: usize::MAX,
last_full_snapshot_slot: LastFullSnapshotSlot::default(),
};
for i in 0..MAX_SNAPSHOT_HASHES + 1 {
let accounts_package = AccountsPackage {

3
core/src/test_validator.rs
View File

@ -15,7 +15,7 @@ use {
solana_runtime::{
genesis_utils::create_genesis_config_with_leader_ex,
hardened_unpack::MAX_GENESIS_ARCHIVE_UNPACKED_SIZE,
snapshot_config::{LastFullSnapshotSlot, SnapshotConfig},
snapshot_config::SnapshotConfig,
snapshot_utils::{
ArchiveFormat, SnapshotVersion, DEFAULT_MAX_FULL_SNAPSHOT_ARCHIVES_TO_RETAIN,
},
@ -528,7 +528,6 @@ impl TestValidator {
archive_format: ArchiveFormat::Tar,
snapshot_version: SnapshotVersion::default(),
maximum_snapshots_to_retain: DEFAULT_MAX_FULL_SNAPSHOT_ARCHIVES_TO_RETAIN,
last_full_snapshot_slot: LastFullSnapshotSlot::default(),
}),
enforce_ulimit_nofile: false,
warp_slot: config.warp_slot,

3
core/tests/snapshots.rs
View File

@ -65,7 +65,7 @@ mod tests {
bank_forks::BankForks,
genesis_utils::{create_genesis_config, GenesisConfigInfo},
snapshot_archive_info::FullSnapshotArchiveInfo,
snapshot_config::{LastFullSnapshotSlot, SnapshotConfig},
snapshot_config::SnapshotConfig,
snapshot_package::{
AccountsPackage, PendingSnapshotPackage, SnapshotPackage, SnapshotType,
},
@ -148,7 +148,6 @@ mod tests {
archive_format: ArchiveFormat::TarBzip2,
snapshot_version,
maximum_snapshots_to_retain: DEFAULT_MAX_FULL_SNAPSHOT_ARCHIVES_TO_RETAIN,
last_full_snapshot_slot: LastFullSnapshotSlot::default(),
};
bank_forks.set_snapshot_config(Some(snapshot_config.clone()));
SnapshotTestConfig {