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

prior_roots -> historical_roots (#24064)

This commit is contained in:
Jeff Washington (jwash) 2022-04-02 12:01:43 -05:00 committed by GitHub
parent ec97d6d078
commit 0ca5a0ec68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/src/serde_snapshot.rs
View File

@ -104,8 +104,8 @@ impl<T> SnapshotAccountsDbFields<T> {
incremental_snapshot_version, incremental_snapshot_version,
incremental_snapshot_slot, incremental_snapshot_slot,
incremental_snapshot_bank_hash_info, incremental_snapshot_bank_hash_info,
incremental_snapshot_prior_roots, incremental_snapshot_historical_roots,
incremental_snapshot_prior_roots_with_hash, incremental_snapshot_historical_roots_with_hash,
)) => { )) => {
let full_snapshot_storages = self.full_snapshot_accounts_db_fields.0; let full_snapshot_storages = self.full_snapshot_accounts_db_fields.0;
let full_snapshot_slot = self.full_snapshot_accounts_db_fields.2; let full_snapshot_slot = self.full_snapshot_accounts_db_fields.2;
@ -128,8 +128,8 @@ impl<T> SnapshotAccountsDbFields<T> {
incremental_snapshot_version, incremental_snapshot_version,
incremental_snapshot_slot, incremental_snapshot_slot,
incremental_snapshot_bank_hash_info, incremental_snapshot_bank_hash_info,
incremental_snapshot_prior_roots, incremental_snapshot_historical_roots,
incremental_snapshot_prior_roots_with_hash, incremental_snapshot_historical_roots_with_hash,
)) ))
} }
} }
@ -429,8 +429,8 @@ where
snapshot_version, snapshot_version,
snapshot_slot, snapshot_slot,
snapshot_bank_hash_info, snapshot_bank_hash_info,
_snapshot_prior_roots, _snapshot_historical_roots,
_snapshot_prior_roots_with_hash, _snapshot_historical_roots_with_hash,
) = snapshot_accounts_db_fields.collapse_into()?; ) = snapshot_accounts_db_fields.collapse_into()?;
let snapshot_storages = snapshot_storages.into_iter().collect::<Vec<_>>(); let snapshot_storages = snapshot_storages.into_iter().collect::<Vec<_>>();

10
runtime/src/serde_snapshot/newer.rs
View File

@ -238,8 +238,8 @@ impl<'a> TypeContext<'a> for Context {
.unwrap_or_else(|| panic!("No bank_hashes entry for slot {}", serializable_db.slot)) .unwrap_or_else(|| panic!("No bank_hashes entry for slot {}", serializable_db.slot))
.clone(); .clone();
// for now, prior_roots is the same as 'roots' and is redundant with the storages we persist in the snapshot // for now, historical_roots is the same as 'roots' and is redundant with the storages we persist in the snapshot
let prior_roots = serializable_db let historical_roots = serializable_db
.accounts_db .accounts_db
.accounts_index .accounts_index
.roots_tracker .roots_tracker
@ -247,7 +247,7 @@ impl<'a> TypeContext<'a> for Context {
.unwrap() .unwrap()
.alive_roots .alive_roots
.get_all(); .get_all();
let prior_roots_with_hash = Vec::<(Slot, Hash)>::default(); let historical_roots_with_hash = Vec::<(Slot, Hash)>::default();
let mut serialize_account_storage_timer = Measure::start("serialize_account_storage_ms"); let mut serialize_account_storage_timer = Measure::start("serialize_account_storage_ms");
let result = ( let result = (
@ -255,8 +255,8 @@ impl<'a> TypeContext<'a> for Context {
version, version,
slot, slot,
hash, hash,
prior_roots, historical_roots,
prior_roots_with_hash, historical_roots_with_hash,
) )
.serialize(serializer); .serialize(serializer);
serialize_account_storage_timer.stop(); serialize_account_storage_timer.stop();