splits out gossip Protocol out of cluster_info.rs (#3488)

Reorganizing this code in preparation of upcoming changes to gossip Protocol (de)serialization.
anza-xyz · Nov 6, 2024 · bdf95ad · bdf95ad
1 parent 4e7f7f7
commit bdf95ad
Show file tree

Hide file tree

Showing 10 changed files with 757 additions and 699 deletions.
diff --git a/gossip/src/cluster_info.rs b/gossip/src/cluster_info.rs
diff --git a/gossip/src/crds_data.rs b/gossip/src/crds_data.rs
@@ -1,6 +1,5 @@
 use {
     crate::{
-        cluster_info::MAX_ACCOUNTS_HASHES,
         contact_info::ContactInfo,
         deprecated,
         duplicate_shred::{DuplicateShred, DuplicateShredIndex, MAX_DUPLICATE_SHREDS},
@@ -24,6 +23,10 @@ use {
 
 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
+/// such that the serialized size of the push/pull message stays below
+/// PACKET_DATA_SIZE.
+const MAX_ACCOUNTS_HASHES: usize = 16;
 
 pub(crate) type VoteIndex = u8;
 // TODO: Remove this in favor of vote_state::MAX_LOCKOUT_HISTORY once

diff --git a/gossip/src/crds_gossip.rs b/gossip/src/crds_gossip.rs
@@ -6,7 +6,6 @@
 
 use {
     crate::{
-        cluster_info::Ping,
         cluster_info_metrics::GossipStats,
         contact_info::ContactInfo,
         crds::{Crds, GossipRoute},
@@ -17,6 +16,7 @@ use {
         crds_value::CrdsValue,
         duplicate_shred::{self, DuplicateShredIndex, MAX_DUPLICATE_SHREDS},
         ping_pong::PingCache,
+        protocol::Ping,
     },
     itertools::Itertools,
     rand::{CryptoRng, Rng},

diff --git a/gossip/src/crds_gossip_pull.rs b/gossip/src/crds_gossip_pull.rs
@@ -13,14 +13,14 @@
 
 use {
     crate::{
-        cluster_info::Ping,
         cluster_info_metrics::GossipStats,
         contact_info::ContactInfo,
         crds::{Crds, GossipRoute, VersionedCrdsValue},
         crds_gossip,
         crds_gossip_error::CrdsGossipError,
         crds_value::CrdsValue,
         ping_pong::PingCache,
+        protocol::Ping,
     },
     itertools::Itertools,
     rand::{
@@ -655,9 +655,9 @@ pub(crate) mod tests {
     use {
         super::*,
         crate::{
-            cluster_info::Protocol,
             crds_data::{CrdsData, Vote},
             legacy_contact_info::LegacyContactInfo,
+            protocol::Protocol,
         },
         itertools::Itertools,
         rand::{seq::SliceRandom, SeedableRng},

diff --git a/gossip/src/crds_gossip_push.rs b/gossip/src/crds_gossip_push.rs
@@ -13,11 +13,12 @@
 
 use {
     crate::{
-        cluster_info::{Ping, CRDS_UNIQUE_PUBKEY_CAPACITY},
+        cluster_info::CRDS_UNIQUE_PUBKEY_CAPACITY,
         crds::{Crds, CrdsError, Cursor, GossipRoute},
         crds_gossip,
         crds_value::CrdsValue,
         ping_pong::PingCache,
+        protocol::Ping,
         push_active_set::PushActiveSet,
         received_cache::ReceivedCache,
     },

diff --git a/gossip/src/duplicate_shred_handler.rs b/gossip/src/duplicate_shred_handler.rs
@@ -227,8 +227,8 @@ mod tests {
     use {
         super::*,
         crate::{
-            cluster_info::DUPLICATE_SHRED_MAX_PAYLOAD_SIZE,
             duplicate_shred::{from_shred, tests::new_rand_shred},
+            protocol::DUPLICATE_SHRED_MAX_PAYLOAD_SIZE,
         },
         crossbeam_channel::unbounded,
         itertools::Itertools,

diff --git a/gossip/src/epoch_slots.rs b/gossip/src/epoch_slots.rs
@@ -1,7 +1,7 @@
 use {
     crate::{
-        cluster_info::MAX_CRDS_OBJECT_SIZE,
         crds_data::{self, MAX_SLOT, MAX_WALLCLOCK},
+        protocol::MAX_CRDS_OBJECT_SIZE,
     },
     bincode::serialized_size,
     bv::BitVec,

diff --git a/gossip/src/lib.rs b/gossip/src/lib.rs
@@ -23,6 +23,7 @@ pub mod gossip_service;
 #[macro_use]
 mod legacy_contact_info;
 pub mod ping_pong;
+mod protocol;
 mod push_active_set;
 mod received_cache;
 pub mod restart_crds_values;