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

Rename CompressionType to ArchiveFormat

Browse Source
This commit is contained in:
Michael Vines
2021-01-07 22:45:42 -08:00
parent 141e6706e6
commit 7be6770808
13 changed files with 106 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/accounts_hash_verifier.rs
View File

@ -175,7 +175,7 @@ mod tests {
use super::*;
use crate::cluster_info::make_accounts_hashes_message;
use crate::contact_info::ContactInfo;
use solana_runtime::bank_forks::CompressionType;
use solana_runtime::bank_forks::ArchiveFormat;
use solana_runtime::snapshot_utils::SnapshotVersion;
use solana_sdk::{
hash::hash,
@ -239,7 +239,7 @@ mod tests {
snapshot_links,
tar_output_file: PathBuf::from("."),
storages: vec![],
compression: CompressionType::Bzip2,
archive_format: ArchiveFormat::TarBzip2,
snapshot_version: SnapshotVersion::default(),
};

6
core/src/rpc_service.rs
View File

@ -439,9 +439,7 @@ mod tests {
genesis_utils::{create_genesis_config, GenesisConfigInfo},
get_tmp_ledger_path,
};
use solana_runtime::{
bank::Bank, bank_forks::CompressionType, snapshot_utils::SnapshotVersion,
};
use solana_runtime::{bank::Bank, bank_forks::ArchiveFormat, snapshot_utils::SnapshotVersion};
use solana_sdk::{genesis_config::ClusterType, signature::Signer};
use std::net::{IpAddr, Ipv4Addr};
@ -534,7 +532,7 @@ mod tests {
snapshot_interval_slots: 0,
snapshot_package_output_path: PathBuf::from("/"),
snapshot_path: PathBuf::from("/"),
compression: CompressionType::Bzip2,
archive_format: ArchiveFormat::TarBzip2,
snapshot_version: SnapshotVersion::default(),
}),
bank_forks,

8
core/src/snapshot_packager_service.rs
View File

@ -81,7 +81,7 @@ mod tests {
use solana_runtime::{
accounts_db::AccountStorageEntry,
bank::BankSlotDelta,
bank_forks::CompressionType,
bank_forks::ArchiveFormat,
snapshot_package::AccountsPackage,
snapshot_utils::{self, SnapshotVersion, SNAPSHOT_STATUS_CACHE_FILE_NAME},
};
@ -163,7 +163,7 @@ mod tests {
let output_tar_path = snapshot_utils::get_snapshot_archive_path(
&snapshot_package_output_path,
&(42, Hash::default()),
&CompressionType::Bzip2,
&ArchiveFormat::TarBzip2,
);
let snapshot_package = AccountsPackage::new(
5,
@ -173,7 +173,7 @@ mod tests {
vec![storage_entries],
output_tar_path.clone(),
Hash::default(),
CompressionType::Bzip2,
ArchiveFormat::TarBzip2,
SnapshotVersion::default(),
);
@ -198,7 +198,7 @@ mod tests {
output_tar_path,
snapshots_dir,
accounts_dir,
CompressionType::Bzip2,
ArchiveFormat::TarBzip2,
);
}
}

4
core/src/test_validator.rs
View File

@ -8,7 +8,7 @@ use {
solana_client::rpc_client::RpcClient,
solana_ledger::{blockstore::create_new_ledger, create_new_tmp_ledger},
solana_runtime::{
bank_forks::{CompressionType, SnapshotConfig, SnapshotVersion},
bank_forks::{ArchiveFormat, SnapshotConfig, SnapshotVersion},
genesis_utils::create_genesis_config_with_leader_ex,
hardened_unpack::MAX_GENESIS_ARCHIVE_UNPACKED_SIZE,
},
@ -354,7 +354,7 @@ impl TestValidator {
snapshot_interval_slots: 100,
snapshot_path: ledger_path.join("snapshot"),
snapshot_package_output_path: ledger_path.to_path_buf(),
compression: CompressionType::NoCompression,
archive_format: ArchiveFormat::Tar,
snapshot_version: SnapshotVersion::default(),
}),
enforce_ulimit_nofile: false,

16
core/tests/snapshots.rs
View File

@ -45,7 +45,7 @@ mod tests {
use solana_runtime::{
accounts_background_service::{ABSRequestSender, SnapshotRequestHandler},
bank::{Bank, BankSlotDelta},
bank_forks::{BankForks, CompressionType, SnapshotConfig},
bank_forks::{ArchiveFormat, BankForks, SnapshotConfig},
genesis_utils::{create_genesis_config, GenesisConfigInfo},
snapshot_utils,
snapshot_utils::SnapshotVersion,
@ -106,7 +106,7 @@ mod tests {
snapshot_interval_slots,
snapshot_package_output_path: PathBuf::from(snapshot_output_path.path()),
snapshot_path: PathBuf::from(snapshot_dir.path()),
compression: CompressionType::Bzip2,
archive_format: ArchiveFormat::TarBzip2,
snapshot_version,
};
bank_forks.set_snapshot_config(Some(snapshot_config.clone()));
@ -146,9 +146,9 @@ mod tests {
snapshot_utils::get_snapshot_archive_path(
snapshot_package_output_path,
&(old_last_bank.slot(), old_last_bank.get_accounts_hash()),
&CompressionType::Bzip2,
&ArchiveFormat::TarBzip2,
),
CompressionType::Bzip2,
ArchiveFormat::TarBzip2,
old_genesis_config,
None,
None,
@ -226,7 +226,7 @@ mod tests {
last_bank.src.slot_deltas(&last_bank.src.roots()),
&snapshot_config.snapshot_package_output_path,
last_bank.get_snapshot_storages(),
CompressionType::Bzip2,
ArchiveFormat::TarBzip2,
snapshot_version,
)
.unwrap();
@ -347,7 +347,7 @@ mod tests {
&snapshot_path,
&snapshot_package_output_path,
snapshot_config.snapshot_version,
&snapshot_config.compression,
&snapshot_config.archive_format,
)
.unwrap();
@ -375,7 +375,7 @@ mod tests {
saved_archive_path = Some(snapshot_utils::get_snapshot_archive_path(
snapshot_package_output_path,
&(slot, accounts_hash),
&CompressionType::Bzip2,
&ArchiveFormat::TarBzip2,
));
}
}
@ -432,7 +432,7 @@ mod tests {
saved_accounts_dir
.path()
.join(accounts_dir.path().file_name().unwrap()),
CompressionType::Bzip2,
ArchiveFormat::TarBzip2,
);
}