Move fake Sync protocol back to integration tests

spectrum-finance · Nov 25, 2022 · 6ad53a0 · 6ad53a0
1 parent 0be19cb
commit 6ad53a0
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 26 deletions.
diff --git a/spectrum-network/src/protocol_handler.rs b/spectrum-network/src/protocol_handler.rs
@@ -18,8 +18,6 @@ use std::pin::Pin;
 use std::task::{Context, Poll};
 
 pub mod codec;
-#[cfg(feature = "integration_tests")]
-pub mod fake_sync;
 pub mod sync;
 pub mod versioning;
 

diff --git a/spectrum-network/src/protocol_upgrade.rs b/spectrum-network/src/protocol_upgrade.rs
@@ -2,8 +2,7 @@ pub mod combinators;
 pub mod handshake;
 mod message;
 pub(crate) mod substream;
-pub(crate) mod supported_protocol_vers;
-pub use supported_protocol_vers::GetSupportedProtocolVer;
+pub mod supported_protocol_vers;
 
 use crate::protocol::ProtocolSpec;
 use crate::protocol_upgrade::message::{Approve, APPROVE_SIZE};

diff --git a/spectrum-network/src/protocol_upgrade/supported_protocol_vers.rs b/spectrum-network/src/protocol_upgrade/supported_protocol_vers.rs
@@ -10,8 +10,6 @@ use std::{
 
 use libp2p::core::upgrade;
 
-#[cfg(feature = "integration_tests")]
-use crate::protocol_handler::fake_sync::FakeSyncSpec;
 use crate::{
     protocol::SYNC_PROTOCOL_ID,
     protocol_handler::sync::message::SyncSpec,
@@ -40,13 +38,6 @@ impl GetSupportedProtocolId for SyncSpec {
     }
 }
 
-#[cfg(feature = "integration_tests")]
-impl GetSupportedProtocolId for FakeSyncSpec {
-    fn get_supported_id() -> SupportedProtocolId {
-        SupportedProtocolId(SYNC_PROTOCOL_ID)
-    }
-}
-
 /// A B-tree mapping from `SupportedProtocolVer` to `T`. Keys are ordered from highest to lowest.
 /// Once created, the mapping itself cannot be altered, but the mapped values can be mutated.
 #[derive(Debug, Clone)]

diff --git a/...network/src/protocol_handler/fake_sync.rs → ...work/tests/integration_tests/fake_sync.rs b/...network/src/protocol_handler/fake_sync.rs → ...work/tests/integration_tests/fake_sync.rs
@@ -6,7 +6,11 @@ use std::{
     task::{Context, Poll},
 };
 
-use crate::{
+use derive_more::Display;
+use futures::{stream::FuturesOrdered, Future, Stream};
+use libp2p::PeerId;
+use serde::{Deserialize, Serialize};
+use spectrum_network::{
     peer_manager::Peers,
     protocol::SYNC_PROTOCOL_ID,
     protocol_handler::{
@@ -20,10 +24,6 @@ use crate::{
     protocol_upgrade::supported_protocol_vers::{GetSupportedProtocolId, SupportedProtocolId},
     types::{ProtocolId, ProtocolVer},
 };
-use derive_more::Display;
-use futures::{stream::FuturesOrdered, Future, Stream};
-use libp2p::PeerId;
-use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 pub enum FakeSyncMessage {
@@ -52,7 +52,13 @@ impl FakeSyncSpec {
     }
 }
 
-impl crate::protocol_handler::ProtocolSpec for FakeSyncSpec {
+impl GetSupportedProtocolId for FakeSyncSpec {
+    fn get_supported_id() -> SupportedProtocolId {
+        SyncSpec::get_supported_id()
+    }
+}
+
+impl spectrum_network::protocol_handler::ProtocolSpec for FakeSyncSpec {
     type THandshake = SyncHandshake;
     type TMessage = FakeSyncMessage;
 }
@@ -182,7 +188,7 @@ where
     fn inject_protocol_enabled(
         &mut self,
         peer_id: PeerId,
-        _handshake: Option<<Self::TProto as crate::protocol_handler::ProtocolSpec>::THandshake>,
+        _handshake: Option<<Self::TProto as spectrum_network::protocol_handler::ProtocolSpec>::THandshake>,
     ) {
         self.send_fake_msg(peer_id);
     }

diff --git a/spectrum-network/tests/integration_tests/mod.rs b/spectrum-network/tests/integration_tests/mod.rs
@@ -1,5 +1,6 @@
 use std::{collections::HashMap, time::Duration};
-
+mod fake_sync;
+use crate::integration_tests::fake_sync::{FakeSyncBehaviour, FakeSyncMessage, FakeSyncMessageV1};
 use futures::{
     channel::{mpsc, oneshot},
     StreamExt,
@@ -16,14 +17,13 @@ use spectrum_network::{
     protocol::{ProtocolConfig, ProtocolSpec, SYNC_PROTOCOL_ID},
     protocol_api::ProtocolMailbox,
     protocol_handler::{
-        fake_sync::{FakeSyncBehaviour, FakeSyncMessage, FakeSyncMessageV1},
         sync::{
             message::{SyncMessage, SyncMessageV1, SyncSpec},
             NodeStatus, SyncBehaviour,
         },
         MalformedMessage, ProtocolBehaviour, ProtocolHandler, ProtocolHandlerError,
     },
-    protocol_upgrade::GetSupportedProtocolVer,
+    protocol_upgrade::supported_protocol_vers::GetSupportedProtocolVer,
     types::{ProtocolId, ProtocolVer, Reputation},
 };
 

diff --git a/spectrum-network/tests/tests.rs b/spectrum-network/tests/tests.rs
@@ -27,7 +27,7 @@ use spectrum_network::protocol_api::ProtocolMailbox;
 use spectrum_network::protocol_handler::sync::message::SyncSpec;
 use spectrum_network::protocol_handler::sync::{NodeStatus, SyncBehaviour};
 use spectrum_network::protocol_handler::ProtocolHandler;
-use spectrum_network::protocol_upgrade::GetSupportedProtocolVer;
+use spectrum_network::protocol_upgrade::supported_protocol_vers::GetSupportedProtocolVer;
 use spectrum_network::types::Reputation;
 use std::collections::HashMap;
 use std::{

diff --git a/spectrum-node/src/main.rs b/spectrum-node/src/main.rs
@@ -15,10 +15,10 @@ use spectrum_network::peer_manager::data::PeerDestination;
 use spectrum_network::peer_manager::peers_state::PeerRepo;
 use spectrum_network::peer_manager::{NetworkingConfig, PeerManager, PeerManagerConfig};
 use spectrum_network::protocol::{ProtocolConfig, ProtocolSpec, SYNC_PROTOCOL_ID};
-use spectrum_network::protocol_handler::sync::message::{SyncMessage, SyncMessageV1, SyncSpec};
+use spectrum_network::protocol_handler::sync::message::SyncSpec;
 use spectrum_network::protocol_handler::sync::{NodeStatus, SyncBehaviour};
 use spectrum_network::protocol_handler::ProtocolHandler;
-use spectrum_network::protocol_upgrade::GetSupportedProtocolVer;
+use spectrum_network::protocol_upgrade::supported_protocol_vers::GetSupportedProtocolVer;
 use spectrum_network::types::Reputation;
 use std::time::Duration;