diff --git a/mempool/src/tests/node.rs b/mempool/src/tests/node.rs
index 91123871c5e9c..f6a999d1b702c 100644
--- a/mempool/src/tests/node.rs
+++ b/mempool/src/tests/node.rs
@@ -34,11 +34,15 @@ impl NodeId {
 
 /// Yet another type, to determine the differences between
 /// Validators, ValidatorFullNodes, and FullNodes
+/// TODO: much code is currently disabled under [cfg(wrong_network_abstraction)], NodeType may or may not come back when that changes?
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialOrd, PartialEq)]
 pub enum NodeType {
-    // Validator,
-    // ValidatorFullNode,
-    // FullNode,
+    #[allow(unused)]
+    Validator,
+    #[allow(unused)]
+    ValidatorFullNode,
+    #[allow(unused)]
+    FullNode,
 }
 
 /// A union type for all types of simulated nodes
diff --git a/mempool/src/tests/test_framework.rs b/mempool/src/tests/test_framework.rs
index d45bb6a14dae5..69234cf290334 100644
--- a/mempool/src/tests/test_framework.rs
+++ b/mempool/src/tests/test_framework.rs
@@ -279,7 +279,7 @@ impl MempoolNode {
                 let rmsg = ReceivedMessage {
                     message: NetworkMessage::RpcRequest(RpcRequest {
                         protocol_id,
-                        request_id: 0, // TODO: a number?
+                        request_id: 0,
                         priority: 0,
                         raw_request: data,
                     }),
diff --git a/network/framework/src/application/tests.rs b/network/framework/src/application/tests.rs
index 91fb0650b04e8..e98232a2da0be 100644
--- a/network/framework/src/application/tests.rs
+++ b/network/framework/src/application/tests.rs
@@ -1213,7 +1213,7 @@ async fn wait_for_network_event(
                     let rmsg = ReceivedMessage {
                         message: NetworkMessage::RpcRequest(RpcRequest{
                             protocol_id: outbound_rpc_request.protocol_id,
-                            request_id: 0, // TODO: rand? seq?
+                            request_id: 0,
                             priority: 0,
                             raw_request: outbound_rpc_request.data.into(),
                         }),
diff --git a/network/framework/src/peer/mod.rs b/network/framework/src/peer/mod.rs
index eaa1ffe0e8f01..20276834abfb0 100644
--- a/network/framework/src/peer/mod.rs
+++ b/network/framework/src/peer/mod.rs
@@ -522,8 +522,9 @@ where
                 }
             },
             NetworkMessage::RpcResponse(_) => {
+                // non-reference cast identical to this match case
                 let NetworkMessage::RpcResponse(response) = message else {
-                    panic!()
+                    unreachable!("NetworkMessage type changed between match and let")
                 };
                 self.outbound_rpcs.handle_inbound_response(response)
             },
diff --git a/network/framework/src/peer/test.rs b/network/framework/src/peer/test.rs
index 8c2c46745863b..cf70f40bbe618 100644
--- a/network/framework/src/peer/test.rs
+++ b/network/framework/src/peer/test.rs
@@ -243,16 +243,24 @@ fn peer_send_message() {
     rt.block_on(future::join3(peer.start(), server, client));
 }
 
+fn test_upstream_handlers() -> (
+    Arc<HashMap<ProtocolId, aptos_channel::Sender<(PeerId, ProtocolId), ReceivedMessage>>>,
+    aptos_channel::Receiver<(PeerId, ProtocolId), ReceivedMessage>,
+) {
+    let mut upstream_handlers = HashMap::new();
+    let (sender, receiver) = aptos_channel::new(QueueStyle::FIFO, 100, None);
+    upstream_handlers.insert(PROTOCOL, sender);
+    let upstream_handlers = Arc::new(upstream_handlers);
+    (upstream_handlers, receiver)
+}
+
 // Reading an inbound DirectSendMsg off the wire should notify the PeerManager of
 // an inbound DirectSend.
 #[test]
 fn peer_recv_message() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let mut upstream_handlers = HashMap::new();
-    let (sender, mut receiver) = aptos_channel::new(QueueStyle::FIFO, 50, None);
-    upstream_handlers.insert(PROTOCOL, sender);
-    let upstream_handlers = Arc::new(upstream_handlers);
+    let (upstream_handlers, mut receiver) = test_upstream_handlers();
     let (peer, _peer_handle, connection, _connection_notifs_rx) = build_test_peer(
         rt.handle().clone(),
         TimeService::mock(),
@@ -304,14 +312,8 @@ fn peer_recv_message() {
 fn peers_send_message_concurrent() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let mut upstream_handlers_a = HashMap::new();
-    let (prot_a_tx, mut prot_a_rx) = aptos_channel::new(QueueStyle::FIFO, 100, None);
-    upstream_handlers_a.insert(PROTOCOL, prot_a_tx);
-    let upstream_handlers_a = Arc::new(upstream_handlers_a);
-    let mut upstream_handlers_b = HashMap::new();
-    let (prot_b_tx, mut prot_b_rx) = aptos_channel::new(QueueStyle::FIFO, 100, None);
-    upstream_handlers_b.insert(PROTOCOL, prot_b_tx);
-    let upstream_handlers_b = Arc::new(upstream_handlers_b);
+    let (upstream_handlers_a, mut prot_a_rx) = test_upstream_handlers();
+    let (upstream_handlers_b, mut prot_b_rx) = test_upstream_handlers();
     let (
         (peer_a, mut peer_handle_a, mut connection_notifs_rx_a),
         (peer_b, mut peer_handle_b, mut connection_notifs_rx_b),
@@ -385,10 +387,7 @@ fn peers_send_message_concurrent() {
 fn peer_recv_rpc() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let mut upstream_handlers = HashMap::new();
-    let (prot_tx, mut prot_rx) = aptos_channel::new(QueueStyle::FIFO, 100, None);
-    upstream_handlers.insert(PROTOCOL, prot_tx);
-    let upstream_handlers = Arc::new(upstream_handlers);
+    let (upstream_handlers, mut prot_rx) = test_upstream_handlers();
     let (peer, _peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
         rt.handle().clone(),
         TimeService::mock(),
@@ -459,10 +458,7 @@ fn peer_recv_rpc() {
 fn peer_recv_rpc_concurrent() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let mut upstream_handlers = HashMap::new();
-    let (prot_tx, mut prot_rx) = aptos_channel::new(QueueStyle::FIFO, 100, None);
-    upstream_handlers.insert(PROTOCOL, prot_tx);
-    let upstream_handlers = Arc::new(upstream_handlers);
+    let (upstream_handlers, mut prot_rx) = test_upstream_handlers();
     let (peer, _peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
         rt.handle().clone(),
         TimeService::mock(),
@@ -529,10 +525,7 @@ fn peer_recv_rpc_timeout() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
     let mock_time = MockTimeService::new();
-    let mut upstream_handlers = HashMap::new();
-    let (prot_tx, mut prot_rx) = aptos_channel::new(QueueStyle::FIFO, 100, None);
-    upstream_handlers.insert(PROTOCOL, prot_tx);
-    let upstream_handlers = Arc::new(upstream_handlers);
+    let (upstream_handlers, mut prot_rx) = test_upstream_handlers();
     let (peer, _peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
         rt.handle().clone(),
         mock_time.clone().into(),
@@ -589,10 +582,7 @@ fn peer_recv_rpc_timeout() {
 fn peer_recv_rpc_cancel() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let mut upstream_handlers = HashMap::new();
-    let (prot_tx, mut prot_rx) = aptos_channel::new(QueueStyle::FIFO, 100, None);
-    upstream_handlers.insert(PROTOCOL, prot_tx);
-    let upstream_handlers = Arc::new(upstream_handlers);
+    let (upstream_handlers, mut prot_rx) = test_upstream_handlers();
     let (peer, _peer_handle, mut connection, _connection_notifs_rx) = build_test_peer(
         rt.handle().clone(),
         TimeService::mock(),
@@ -973,14 +963,8 @@ fn peer_terminates_when_request_tx_has_dropped() {
 fn peers_send_multiplex() {
     ::aptos_logger::Logger::init_for_testing();
     let rt = Runtime::new().unwrap();
-    let mut upstream_handlers_a = HashMap::new();
-    let (prot_a_tx, mut prot_a_rx) = aptos_channel::new(QueueStyle::FIFO, 100, None);
-    upstream_handlers_a.insert(PROTOCOL, prot_a_tx);
-    let upstream_handlers_a = Arc::new(upstream_handlers_a);
-    let mut upstream_handlers_b = HashMap::new();
-    let (prot_b_tx, mut prot_b_rx) = aptos_channel::new(QueueStyle::FIFO, 100, None);
-    upstream_handlers_b.insert(PROTOCOL, prot_b_tx);
-    let upstream_handlers_b = Arc::new(upstream_handlers_b);
+    let (upstream_handlers_a, mut prot_a_rx) = test_upstream_handlers();
+    let (upstream_handlers_b, mut prot_b_rx) = test_upstream_handlers();
     let (
         (peer_a, mut peer_handle_a, mut connection_notifs_rx_a),
         (peer_b, mut peer_handle_b, mut connection_notifs_rx_b),