diff --git a/runtime/src/serde_snapshot.rs b/runtime/src/serde_snapshot.rs index 343e66ad6e..f5d291e493 100644 --- a/runtime/src/serde_snapshot.rs +++ b/runtime/src/serde_snapshot.rs @@ -104,8 +104,8 @@ impl SnapshotAccountsDbFields { incremental_snapshot_version, incremental_snapshot_slot, incremental_snapshot_bank_hash_info, - incremental_snapshot_prior_roots, - incremental_snapshot_prior_roots_with_hash, + incremental_snapshot_historical_roots, + incremental_snapshot_historical_roots_with_hash, )) => { let full_snapshot_storages = self.full_snapshot_accounts_db_fields.0; let full_snapshot_slot = self.full_snapshot_accounts_db_fields.2; @@ -128,8 +128,8 @@ impl SnapshotAccountsDbFields { incremental_snapshot_version, incremental_snapshot_slot, incremental_snapshot_bank_hash_info, - incremental_snapshot_prior_roots, - incremental_snapshot_prior_roots_with_hash, + incremental_snapshot_historical_roots, + incremental_snapshot_historical_roots_with_hash, )) } } @@ -429,8 +429,8 @@ where snapshot_version, snapshot_slot, snapshot_bank_hash_info, - _snapshot_prior_roots, - _snapshot_prior_roots_with_hash, + _snapshot_historical_roots, + _snapshot_historical_roots_with_hash, ) = snapshot_accounts_db_fields.collapse_into()?; let snapshot_storages = snapshot_storages.into_iter().collect::>(); diff --git a/runtime/src/serde_snapshot/newer.rs b/runtime/src/serde_snapshot/newer.rs index ae8a5317f7..4716f006ba 100644 --- a/runtime/src/serde_snapshot/newer.rs +++ b/runtime/src/serde_snapshot/newer.rs @@ -238,8 +238,8 @@ impl<'a> TypeContext<'a> for Context { .unwrap_or_else(|| panic!("No bank_hashes entry for slot {}", serializable_db.slot)) .clone(); - // for now, prior_roots is the same as 'roots' and is redundant with the storages we persist in the snapshot - let prior_roots = serializable_db + // for now, historical_roots is the same as 'roots' and is redundant with the storages we persist in the snapshot + let historical_roots = serializable_db .accounts_db .accounts_index .roots_tracker @@ -247,7 +247,7 @@ impl<'a> TypeContext<'a> for Context { .unwrap() .alive_roots .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 result = ( @@ -255,8 +255,8 @@ impl<'a> TypeContext<'a> for Context { version, slot, hash, - prior_roots, - prior_roots_with_hash, + historical_roots, + historical_roots_with_hash, ) .serialize(serializer); serialize_account_storage_timer.stop();