diff --git a/runtime/src/serde_snapshot.rs b/runtime/src/serde_snapshot.rs index ff9372edad..5c21fd2b71 100644 --- a/runtime/src/serde_snapshot.rs +++ b/runtime/src/serde_snapshot.rs @@ -44,7 +44,6 @@ use { }, }; -mod common; mod newer; mod storage; mod tests; diff --git a/runtime/src/serde_snapshot/common.rs b/runtime/src/serde_snapshot/common.rs deleted file mode 100644 index e8464ea3de..0000000000 --- a/runtime/src/serde_snapshot/common.rs +++ /dev/null @@ -1,8 +0,0 @@ -use {super::*, std::collections::HashSet}; - -#[derive(Default, Clone, PartialEq, Debug, Deserialize, Serialize, AbiExample)] -pub(crate) struct UnusedAccounts { - unused1: HashSet, - unused2: HashSet, - unused3: HashMap, -} diff --git a/runtime/src/serde_snapshot/newer.rs b/runtime/src/serde_snapshot/newer.rs index 1ef13e28e8..4c12d97428 100644 --- a/runtime/src/serde_snapshot/newer.rs +++ b/runtime/src/serde_snapshot/newer.rs @@ -1,17 +1,23 @@ use { super::{ - common::UnusedAccounts, storage::SerializableAccountStorageEntry, utils::{serialize_iter_as_map, serialize_iter_as_seq}, *, }, crate::{ancestors::AncestorsForSerialization, stakes::StakesCache}, solana_measure::measure::Measure, - std::{cell::RefCell, sync::RwLock}, + std::{cell::RefCell, collections::HashSet, sync::RwLock}, }; type AccountsDbFields = super::AccountsDbFields; +#[derive(Default, Clone, PartialEq, Debug, Deserialize, Serialize, AbiExample)] +struct UnusedAccounts { + unused1: HashSet, + unused2: HashSet, + unused3: HashMap, +} + // Deserializable version of Bank which need not be serializable, // because it's handled by SerializableVersionedBank. // So, sync fields with it! diff --git a/runtime/src/serde_snapshot/tests.rs b/runtime/src/serde_snapshot/tests.rs index 212c830bd7..faf55adf19 100644 --- a/runtime/src/serde_snapshot/tests.rs +++ b/runtime/src/serde_snapshot/tests.rs @@ -305,7 +305,7 @@ mod test_bank_serialize { // This some what long test harness is required to freeze the ABI of // Bank's serialization due to versioned nature - #[frozen_abi(digest = "7PcarCw6gpw9Yw8xypdxQP24TFjLiaHyuDkq95cgwtte")] + #[frozen_abi(digest = "HVyzePMkma8T54PymRW32FAgDXpSdom59K6RnPsCNJjj")] #[derive(Serialize, AbiExample)] pub struct BankAbiTestWrapperNewer { #[serde(serialize_with = "wrapper_newer")]