[Networking] Rename StateSynchronizerDirectSend protocol to StateSync…

…DirectSend
lexfrl · Jan 22, 2021 · 995d81e · 995d81e
1 parent 88de0f0
commit 995d81e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/network/src/peer/fuzzing.rs b/network/src/peer/fuzzing.rs
@@ -88,7 +88,7 @@ pub fn fuzz(data: &[u8]) {
  ProtocolId::ConsensusRpc,
  ProtocolId::ConsensusDirectSend,
  ProtocolId::MempoolDirectSend,
- ProtocolId::StateSynchronizerDirectSend,
+ ProtocolId::StateSyncDirectSend,
  ProtocolId::DiscoveryDirectSend,
  ProtocolId::HealthCheckerRpc,
  ]

diff --git a/network/src/protocols/wire/handshake/v1/mod.rs b/network/src/protocols/wire/handshake/v1/mod.rs
@@ -36,7 +36,7 @@ pub enum ProtocolId {
  ConsensusRpc = 0,
  ConsensusDirectSend = 1,
  MempoolDirectSend = 2,
- StateSynchronizerDirectSend = 3,
+ StateSyncDirectSend = 3,
  DiscoveryDirectSend = 4,
  HealthCheckerRpc = 5,
 }
@@ -48,7 +48,7 @@ impl ProtocolId {
  ConsensusRpc => "ConsensusRpc",
  ConsensusDirectSend => "ConsensusDirectSend",
  MempoolDirectSend => "MempoolDirectSend",
- StateSynchronizerDirectSend => "StateSynchronizerDirectSend",
+ StateSyncDirectSend => "StateSyncDirectSend",
  DiscoveryDirectSend => "DiscoveryDirectSend",
  HealthCheckerRpc => "HealthCheckerRpc",
  }
@@ -175,7 +175,7 @@ impl HandshakeMsg {
  let mut supported_protocols = BTreeMap::new();
  supported_protocols.insert(
  MessagingProtocolVersion::V1,
- [ProtocolId::StateSynchronizerDirectSend].iter().into(),
+ [ProtocolId::StateSyncDirectSend].iter().into(),
  );
  Self {
  chain_id: ChainId::test(),

diff --git a/specifications/network/messaging-v1.md b/specifications/network/messaging-v1.md
@@ -26,7 +26,7 @@ enum ProtocolId {
  ConsensusRpc = 0,
  ConsensusDirectSend = 1,
  MempoolDirectSend = 2,
- StateSynchronizerDirectSend = 3,
+ StateSyncDirectSend = 3,
  DiscoveryDirectSend = 4,
  HealthCheckerRpc = 5,
  IdentityDirectSend = 6,

diff --git a/state-sync/src/network.rs b/state-sync/src/network.rs
@@ -62,7 +62,7 @@ impl StateSyncSender {
  recipient: PeerId,
  message: StateSynchronizerMsg,
  ) -> Result<(), NetworkError> {
- let protocol = ProtocolId::StateSynchronizerDirectSend;
+ let protocol = ProtocolId::StateSyncDirectSend;
  self.inner.send_to(recipient, protocol, message)
  }
 }
@@ -77,7 +77,7 @@ pub fn network_endpoint_config() -> (
 ) {
  (
  vec![],
- vec![ProtocolId::StateSynchronizerDirectSend],
+ vec![ProtocolId::StateSyncDirectSend],
  QueueStyle::LIFO,
  STATE_SYNC_MAX_BUFFER_SIZE,
  Some(&counters::PENDING_STATE_SYNC_NETWORK_EVENTS),

diff --git a/state-sync/tests/test_harness.rs b/state-sync/tests/test_harness.rs
@@ -424,7 +424,7 @@ impl StateSyncEnvironment {
  let receiver_network_notif_tx = self.network_notifs_txs.get_mut(&receiver_id).unwrap();
  receiver_network_notif_tx
  .push(
- (sender_peer_id, ProtocolId::StateSynchronizerDirectSend),
+ (sender_peer_id, ProtocolId::StateSyncDirectSend),
  PeerManagerNotification::RecvMessage(sender_peer_id, msg.clone()),
  )
  .unwrap();

diff --git a/testsuite/generate-format/tests/staged/network.yaml b/testsuite/generate-format/tests/staged/network.yaml
@@ -131,7 +131,7 @@ ProtocolId:
  2:
  MempoolDirectSend: UNIT
  3:
- StateSynchronizerDirectSend: UNIT
+ StateSyncDirectSend: UNIT
  4:
  DiscoveryDirectSend: UNIT
  5: