basic ideas

Author: alexpyattaev

Cargo.lock

@@ -10,9 +10,11 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
+anyhow = { workspace = true }
 assert_matches = { workspace = true }
 bincode = { workspace = true }
 bv = { workspace = true, features = ["serde"] }
+cfg-if = { workspace = true }
 clap = { workspace = true }
 crossbeam-channel = { workspace = true }
 flate2 = { workspace = true }
@@ -21,13 +23,15 @@ itertools = { workspace = true }
 log = { workspace = true }
 lru = { workspace = true }
 num-traits = { workspace = true }
+pcap-file = "2.0.0"
 rand = { workspace = true }
 rand_chacha = { workspace = true }
 rayon = { workspace = true }
 serde = { workspace = true }
 serde-big-array = { workspace = true }
 serde_bytes = { workspace = true }
 serde_derive = { workspace = true }
+serde_json = { workspace = true, optional = true }
 siphasher = { workspace = true }
 solana-bloom = { workspace = true }
 solana-clap-utils = { workspace = true }
@@ -62,18 +66,17 @@ solana-vote = { workspace = true }
 solana-vote-program = { workspace = true }
 static_assertions = { workspace = true }
 thiserror = { workspace = true }
-
 [dev-dependencies]
 bs58 = { workspace = true }
 criterion = { workspace = true }
 num_cpus = { workspace = true }
 rand0-7 = { workspace = true }
 rand_chacha0-2 = { workspace = true }
 serial_test = { workspace = true }
+solana-gossip = { workspace = true, features = ["dev-context-only-utils"] }
 solana-perf = { workspace = true, features = ["dev-context-only-utils"] }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 test-case = { workspace = true }
-
 [features]
 frozen-abi = [
     "dep:solana-frozen-abi",
@@ -88,6 +91,7 @@ frozen-abi = [
     "solana-vote/frozen-abi",
     "solana-vote-program/frozen-abi",
 ]
+dev-context-only-utils = []
 
 [[bench]]
 name = "crds"

gossip/Cargo.toml

@@ -7,7 +7,6 @@ use {
         legacy_contact_info::LegacyContactInfo,
         restart_crds_values::{RestartHeaviestFork, RestartLastVotedForkSlots},
     },
-    rand::Rng,
     serde::de::{Deserialize, Deserializer},
     solana_sanitize::{Sanitize, SanitizeError},
     solana_sdk::{
@@ -21,6 +20,9 @@ use {
     std::{cmp::Ordering, collections::BTreeSet},
 };
 
+#[cfg(feature = "dev-context-only-utils")]
+use {crate::format_validation::FormatValidation, rand::Rng, std::hint::black_box};
+
 pub(crate) const MAX_WALLCLOCK: u64 = 1_000_000_000_000_000;
 pub(crate) const MAX_SLOT: u64 = 1_000_000_000_000_000;
 /// Maximum number of hashes in AccountsHashes a node publishes
@@ -233,9 +235,9 @@ impl Sanitize for AccountsHashes {
     }
 }
 
-impl AccountsHashes {
-    /// New random AccountsHashes for tests and benchmarks.
-    pub(crate) fn new_rand<R: Rng>(rng: &mut R, pubkey: Option<Pubkey>) -> Self {
+#[cfg(feature = "dev-context-only-utils")]
+impl FormatValidation for AccountsHashes {
+    fn new_rand<R: Rng>(rng: &mut R, pubkey: Option<Pubkey>) -> Self {
         let num_hashes = rng.gen_range(0..MAX_ACCOUNTS_HASHES) + 1;
         let hashes = std::iter::repeat_with(|| {
             let slot = 47825632 + rng.gen_range(0..512);
@@ -250,6 +252,13 @@ impl AccountsHashes {
             wallclock: new_rand_timestamp(rng),
         }
     }
+
+    fn exercise(&self) -> anyhow::Result<()> {
+        FormatValidation::exercise(&self)?;
+        let s: u64 = self.hashes.iter().map(|v| v.0).sum();
+        black_box(s);
+        Ok(())
+    }
 }
 
 type LegacySnapshotHashes = AccountsHashes;
@@ -303,8 +312,10 @@ impl LowestSlot {
             wallclock,
         }
     }
+}
 
-    /// New random LowestSlot for tests and benchmarks.
+#[cfg(feature = "dev-context-only-utils")]
+impl FormatValidation for LowestSlot {
     fn new_rand<R: Rng>(rng: &mut R, pubkey: Option<Pubkey>) -> Self {
         Self {
             from: pubkey.unwrap_or_else(pubkey::new_rand),

gossip/src/crds_data.rs

@@ -46,3 +46,6 @@ extern crate solana_frozen_abi_macro;
 
 #[macro_use]
 extern crate solana_metrics;
+
+#[cfg(feature = "dev-context-only-utils")]
+pub mod format_validation;