f

roles/tests-integration/Cargo.toml

@@ -10,8 +10,7 @@ minreq = { version = "2.12.0", features = ["https"] }
 once_cell = "1.19.0"
 tar = "0.4.41"
 tokio = { version="1.36.0",features = ["full","tracing"] }
-# demand-easy-sv2 = { version = "0.6.0", git = "https://github.com/demand-open-source/demand-easy-sv2.git" }
-
+async-channel = "1.5.1"
 codec_sv2 = { path = "../../protocols/v2/codec-sv2", features = ["noise_sv2"] }
 const_sv2 = { path = "../../protocols/v2/const-sv2" }
 binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }

roles/tests-integration/tests/common/mod.rs

@@ -1,9 +1,11 @@
+pub mod sniffer;
+
 use bitcoind::{bitcoincore_rpc::RpcApi, BitcoinD, Conf};
 use flate2::read::GzDecoder;
 use key_utils::{Secp256k1PublicKey, Secp256k1SecretKey};
 use once_cell::sync::Lazy;
 use pool_sv2::PoolSv2;
-use proxy::SV2Proxy;
+use sniffer::Sniffer;
 use std::{
     collections::HashSet,
     env,
@@ -16,8 +18,6 @@ use std::{
 };
 use tar::Archive;
 
-pub mod proxy;
-
 // prevents get_available_port from ever returning the same port twice
 static UNIQUE_PORTS: Lazy<Mutex<HashSet<u16>>> = Lazy::new(|| Mutex::new(HashSet::new()));
 
@@ -266,13 +266,13 @@ pub async fn start_template_provider(tp_port: u16) -> TemplateProvider {
     template_provider
 }
 
-pub async fn start_proxy(upstream: SocketAddr, downstream: SocketAddr) -> SV2Proxy {
-    let proxy = SV2Proxy::new();
-    let proxy_clone = proxy.clone();
+pub async fn start_sniffer(upstream: SocketAddr, downstream: SocketAddr) -> Sniffer {
+    let sniffer = Sniffer::new(downstream, upstream).await;
+    let sniffer_clone = sniffer.clone();
     tokio::spawn(async move {
-        proxy_clone.start(upstream, downstream).await;
+        sniffer_clone.start().await;
     });
-    proxy
+    sniffer
 }
 
 pub async fn start_poolsv2(
@@ -288,7 +288,9 @@ pub async fn start_poolsv2(
     let pool = test_pool.pool.clone();
     let pool_clone = pool.clone();
     tokio::task::spawn(async move {
-        assert!(pool_clone.start().await.is_ok());
+        let ret = pool_clone.start().await;
+        dbg!(&ret);
+        assert!(ret.is_ok());
     });
     tokio::time::sleep(std::time::Duration::from_secs(1)).await;
     pool