Returns Self instead of Result<Self> for AccountsPackage::new_for_snapshot() (#32545)

This commit is contained in:
Brooks 2023-07-20 12:52:31 -04:00 committed by GitHub
parent 3fbfac41da
commit 979913e1d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 11 deletions

View File

@ -250,8 +250,7 @@ fn run_bank_forks_snapshot_n<F>(
snapshot_config.archive_format, snapshot_config.archive_format,
snapshot_version, snapshot_version,
None, None,
) );
.unwrap();
last_bank.force_flush_accounts_cache(); last_bank.force_flush_accounts_cache();
let accounts_hash = let accounts_hash =
last_bank.update_accounts_hash(CalcAccountsHashDataSource::Storages, false, false); last_bank.update_accounts_hash(CalcAccountsHashDataSource::Storages, false, false);
@ -418,8 +417,7 @@ fn test_concurrent_snapshot_packaging(
snapshot_config.archive_format, snapshot_config.archive_format,
snapshot_config.snapshot_version, snapshot_config.snapshot_version,
None, None,
) );
.unwrap();
accounts_package_sender.send(accounts_package).unwrap(); accounts_package_sender.send(accounts_package).unwrap();
bank_forks.insert(bank); bank_forks.insert(bank);

View File

@ -403,7 +403,7 @@ impl SnapshotRequestHandler {
self.snapshot_config.archive_format, self.snapshot_config.archive_format,
self.snapshot_config.snapshot_version, self.snapshot_config.snapshot_version,
accounts_hash_for_testing, accounts_hash_for_testing,
)? )
} }
SnapshotRequestType::EpochAccountsHash => { SnapshotRequestType::EpochAccountsHash => {
// skip the bank snapshot, just make an accounts package to send to AHV // skip the bank snapshot, just make an accounts package to send to AHV

View File

@ -8,7 +8,7 @@ use {
rent_collector::RentCollector, rent_collector::RentCollector,
snapshot_archive_info::{SnapshotArchiveInfo, SnapshotArchiveInfoGetter}, snapshot_archive_info::{SnapshotArchiveInfo, SnapshotArchiveInfoGetter},
snapshot_hash::SnapshotHash, snapshot_hash::SnapshotHash,
snapshot_utils::{self, ArchiveFormat, BankSnapshotInfo, Result, SnapshotVersion}, snapshot_utils::{self, ArchiveFormat, BankSnapshotInfo, SnapshotVersion},
}, },
log::*, log::*,
solana_sdk::{clock::Slot, feature_set, sysvar::epoch_schedule::EpochSchedule}, solana_sdk::{clock::Slot, feature_set, sysvar::epoch_schedule::EpochSchedule},
@ -57,7 +57,7 @@ impl AccountsPackage {
archive_format: ArchiveFormat, archive_format: ArchiveFormat,
snapshot_version: SnapshotVersion, snapshot_version: SnapshotVersion,
accounts_hash_for_testing: Option<AccountsHash>, accounts_hash_for_testing: Option<AccountsHash>,
) -> Result<Self> { ) -> Self {
if let AccountsPackageType::Snapshot(snapshot_type) = package_type { if let AccountsPackageType::Snapshot(snapshot_type) = package_type {
info!( info!(
"Package snapshot for bank {} has {} account storage entries (snapshot type: {:?})", "Package snapshot for bank {} has {} account storage entries (snapshot type: {:?})",
@ -84,13 +84,13 @@ impl AccountsPackage {
.to_path_buf(), .to_path_buf(),
epoch_accounts_hash: bank.get_epoch_accounts_hash_to_serialize(), epoch_accounts_hash: bank.get_epoch_accounts_hash_to_serialize(),
}; };
Ok(Self::_new( Self::_new(
package_type, package_type,
bank, bank,
snapshot_storages, snapshot_storages,
accounts_hash_for_testing, accounts_hash_for_testing,
Some(snapshot_info), Some(snapshot_info),
)) )
} }
/// Package up fields needed to compute an EpochAccountsHash /// Package up fields needed to compute an EpochAccountsHash

View File

@ -3142,7 +3142,7 @@ pub fn package_and_archive_full_snapshot(
archive_format, archive_format,
snapshot_version, snapshot_version,
None, None,
)?; );
let accounts_hash = bank let accounts_hash = bank
.get_accounts_hash() .get_accounts_hash()
@ -3194,7 +3194,7 @@ pub fn package_and_archive_incremental_snapshot(
archive_format, archive_format,
snapshot_version, snapshot_version,
None, None,
)?; );
let (accounts_hash_enum, accounts_hash_for_reserialize, bank_incremental_snapshot_persistence) = let (accounts_hash_enum, accounts_hash_for_reserialize, bank_incremental_snapshot_persistence) =
if bank if bank