Remove subnet service messages from snapshot tests.

Subnet subscriptions are precomputed in advance in a separate task,
so subscription messages arrive to network service in non-deterministic time intervals,
and that breaks the tests.

http_api/src/context.rs

@@ -95,7 +95,7 @@ impl<P: Preset> Context<P> {
         let (pool_to_api_tx, pool_to_api_rx) = futures::channel::mpsc::unbounded();
         let (pool_to_liveness_tx, pool_to_liveness_rx) = futures::channel::mpsc::unbounded();
         let (pool_to_p2p_tx, pool_to_p2p_rx) = futures::channel::mpsc::unbounded();
-        let (subnet_service_to_p2p_tx, subnet_service_to_p2p_rx) =
+        let (subnet_service_to_p2p_tx, _subnet_service_to_p2p_rx) =
             futures::channel::mpsc::unbounded();
         let (sync_to_api_tx, sync_to_api_rx) = futures::channel::mpsc::unbounded();
         let (subnet_service_tx, subnet_service_rx) = futures::channel::mpsc::unbounded();
@@ -332,7 +332,6 @@ impl<P: Preset> Context<P> {
             fc_to_p2p_rx: Arc::new(Mutex::new(fc_to_p2p_rx)),
             fc_to_sync_rx: Arc::new(Mutex::new(fc_to_sync_rx)),
             pool_to_p2p_rx: Arc::new(Mutex::new(pool_to_p2p_rx)),
-            subnet_service_to_p2p_rx: Arc::new(Mutex::new(subnet_service_to_p2p_rx)),
             validator_to_p2p_rx: Arc::new(Mutex::new(validator_to_p2p_rx)),
         };
 

http_api/src/routing.rs

@@ -55,7 +55,7 @@ use ::{
     crossbeam_utils::sync::WaitGroup,
     fork_choice_control::{P2pMessage, SyncMessage},
     operation_pools::PoolToP2pMessage,
-    p2p::{SubnetServiceToP2p, ValidatorToP2p},
+    p2p::ValidatorToP2p,
 };
 
 #[cfg(test)]
@@ -201,7 +201,6 @@ pub struct TestState<P: Preset> {
     pub fc_to_p2p_rx: SpyReceiver<P2pMessage<P>>,
     pub fc_to_sync_rx: SpyReceiver<SyncMessage<P>>,
     pub pool_to_p2p_rx: SpyReceiver<PoolToP2pMessage>,
-    pub subnet_service_to_p2p_rx: SpyReceiver<SubnetServiceToP2p>,
     pub validator_to_p2p_rx: SpyReceiver<ValidatorToP2p<P>>,
 }
 

http_api/src/test_endpoints.rs

@@ -5,7 +5,7 @@ use axum::{extract::State, Json};
 use clock::Tick;
 use fork_choice_control::{P2pMessage, SyncMessage};
 use operation_pools::PoolToP2pMessage;
-use p2p::{ApiToP2p, SubnetServiceToP2p, ValidatorToP2p};
+use p2p::{ApiToP2p, ValidatorToP2p};
 use serde::Serialize;
 use types::preset::Preset;
 
@@ -21,7 +21,6 @@ pub struct TakeMessagesResponse<P: Preset> {
     fc_to_p2p: Vec<P2pMessage<P>>,
     fc_to_sync: Vec<SyncMessage<P>>,
     pool_to_p2p: Vec<PoolToP2pMessage>,
-    subnet_service_to_p2p: Vec<SubnetServiceToP2p>,
     validator_to_p2p: Vec<ValidatorToP2p<P>>,
 }
 
@@ -56,7 +55,6 @@ pub async fn post_take_messages<P: Preset>(
         fc_to_p2p_rx,
         fc_to_sync_rx,
         pool_to_p2p_rx,
-        subnet_service_to_p2p_rx,
         validator_to_p2p_rx,
     } = test_state;
 
@@ -65,7 +63,6 @@ pub async fn post_take_messages<P: Preset>(
         fc_to_p2p: take(fc_to_p2p_rx).await,
         fc_to_sync: take(fc_to_sync_rx).await,
         pool_to_p2p: take(pool_to_p2p_rx).await,
-        subnet_service_to_p2p: take(subnet_service_to_p2p_rx).await,
         validator_to_p2p: take(validator_to_p2p_rx).await,
     })
 }