Removes full_snapshot from CalcAccountsHashConfig (#29722)
This commit is contained in:
parent
ef30083319
commit
0db14ad39c
|
@ -233,7 +233,6 @@ impl AccountsHashVerifier {
|
||||||
epoch_schedule: &accounts_package.epoch_schedule,
|
epoch_schedule: &accounts_package.epoch_schedule,
|
||||||
rent_collector: &accounts_package.rent_collector,
|
rent_collector: &accounts_package.rent_collector,
|
||||||
store_detailed_debug_info_on_failure: false,
|
store_detailed_debug_info_on_failure: false,
|
||||||
full_snapshot: None,
|
|
||||||
},
|
},
|
||||||
&sorted_storages,
|
&sorted_storages,
|
||||||
timings,
|
timings,
|
||||||
|
@ -255,7 +254,6 @@ impl AccountsHashVerifier {
|
||||||
epoch_schedule: &accounts_package.epoch_schedule,
|
epoch_schedule: &accounts_package.epoch_schedule,
|
||||||
rent_collector: &accounts_package.rent_collector,
|
rent_collector: &accounts_package.rent_collector,
|
||||||
store_detailed_debug_info_on_failure: false,
|
store_detailed_debug_info_on_failure: false,
|
||||||
full_snapshot: None,
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
info!(
|
info!(
|
||||||
|
@ -274,7 +272,6 @@ impl AccountsHashVerifier {
|
||||||
rent_collector: &accounts_package.rent_collector,
|
rent_collector: &accounts_package.rent_collector,
|
||||||
// now that we've failed, store off the failing contents that produced a bad capitalization
|
// now that we've failed, store off the failing contents that produced a bad capitalization
|
||||||
store_detailed_debug_info_on_failure: true,
|
store_detailed_debug_info_on_failure: true,
|
||||||
full_snapshot: None,
|
|
||||||
},
|
},
|
||||||
&sorted_storages,
|
&sorted_storages,
|
||||||
HashStats::default(),
|
HashStats::default(),
|
||||||
|
|
|
@ -323,7 +323,6 @@ fn test_epoch_accounts_hash_basic(test_environment: TestEnvironment) {
|
||||||
epoch_schedule: bank.epoch_schedule(),
|
epoch_schedule: bank.epoch_schedule(),
|
||||||
rent_collector: bank.rent_collector(),
|
rent_collector: bank.rent_collector(),
|
||||||
store_detailed_debug_info_on_failure: false,
|
store_detailed_debug_info_on_failure: false,
|
||||||
full_snapshot: None,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
|
@ -331,7 +331,6 @@ impl SnapshotRequestHandler {
|
||||||
epoch_schedule: snapshot_root_bank.epoch_schedule(),
|
epoch_schedule: snapshot_root_bank.epoch_schedule(),
|
||||||
rent_collector: snapshot_root_bank.rent_collector(),
|
rent_collector: snapshot_root_bank.rent_collector(),
|
||||||
store_detailed_debug_info_on_failure: false,
|
store_detailed_debug_info_on_failure: false,
|
||||||
full_snapshot: None,
|
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
|
@ -7097,7 +7097,6 @@ impl AccountsDb {
|
||||||
epoch_schedule,
|
epoch_schedule,
|
||||||
rent_collector,
|
rent_collector,
|
||||||
store_detailed_debug_info_on_failure: false,
|
store_detailed_debug_info_on_failure: false,
|
||||||
full_snapshot: None,
|
|
||||||
},
|
},
|
||||||
expected_capitalization,
|
expected_capitalization,
|
||||||
)
|
)
|
||||||
|
@ -7386,7 +7385,6 @@ impl AccountsDb {
|
||||||
epoch_schedule,
|
epoch_schedule,
|
||||||
rent_collector,
|
rent_collector,
|
||||||
store_detailed_debug_info_on_failure: store_hash_raw_data_for_debug,
|
store_detailed_debug_info_on_failure: store_hash_raw_data_for_debug,
|
||||||
full_snapshot: None,
|
|
||||||
},
|
},
|
||||||
None,
|
None,
|
||||||
)?;
|
)?;
|
||||||
|
@ -12084,7 +12082,6 @@ pub mod tests {
|
||||||
epoch_schedule: &EPOCH_SCHEDULE,
|
epoch_schedule: &EPOCH_SCHEDULE,
|
||||||
rent_collector: &RENT_COLLECTOR,
|
rent_collector: &RENT_COLLECTOR,
|
||||||
store_detailed_debug_info_on_failure: false,
|
store_detailed_debug_info_on_failure: false,
|
||||||
full_snapshot: None,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,15 +95,6 @@ impl AccountHashesFile {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
#[allow(dead_code)]
|
|
||||||
pub struct FullSnapshotAccountsHashInfo {
|
|
||||||
/// accounts hash over all accounts when the full snapshot was taken
|
|
||||||
hash: AccountsHash,
|
|
||||||
/// slot where full snapshot was taken
|
|
||||||
slot: Slot,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// parameters to calculate accounts hash
|
/// parameters to calculate accounts hash
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct CalcAccountsHashConfig<'a> {
|
pub struct CalcAccountsHashConfig<'a> {
|
||||||
|
@ -120,8 +111,6 @@ pub struct CalcAccountsHashConfig<'a> {
|
||||||
pub rent_collector: &'a RentCollector,
|
pub rent_collector: &'a RentCollector,
|
||||||
/// used for tracking down hash mismatches after the fact
|
/// used for tracking down hash mismatches after the fact
|
||||||
pub store_detailed_debug_info_on_failure: bool,
|
pub store_detailed_debug_info_on_failure: bool,
|
||||||
/// `Some` if this is an incremental snapshot which only hashes slots since the base full snapshot
|
|
||||||
pub full_snapshot: Option<FullSnapshotAccountsHashInfo>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> CalcAccountsHashConfig<'a> {
|
impl<'a> CalcAccountsHashConfig<'a> {
|
||||||
|
|
Loading…
Reference in New Issue