Skip to content

Commit 4bb6f1c

Browse files
authored
Merge pull request #156 from plebhash/2025-12-18-adapt-group-channels
add Group Channel adaptations on apps
2 parents 3847e50 + fc5ff90 commit 4bb6f1c

32 files changed

+3829
-892
lines changed

integration-tests/Cargo.lock

Lines changed: 26 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration-tests/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ tokio = { version="1.44.1", default-features = false, features = ["tracing"] }
2828
tokio-util = { version = "0.7", default-features = false }
2929
tracing = { version = "0.1.41", default-features = false }
3030
tracing-subscriber = { version = "0.3.19", default-features = false }
31+
hex = "0.4.3"
3132

3233
[lib]
3334
path = "lib/mod.rs"

integration-tests/lib/mock_roles.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ impl MockDownstream {
3030
match TcpStream::connect(upstream_address).await {
3131
Ok(stream) => break stream,
3232
Err(_) => {
33-
println!("MockDownstream: unable to connect to upstream, retrying");
33+
tracing::warn!(
34+
"MockDownstream: unable to connect to upstream, retrying after 1 second"
35+
);
36+
tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
3437
}
3538
}
3639
})

integration-tests/lib/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub mod sv1_minerd;
3737
pub mod sv1_sniffer;
3838
pub mod template_provider;
3939
pub mod types;
40-
pub(crate) mod utils;
40+
pub mod utils;
4141

4242
const SHARES_PER_MINUTE: f32 = 120.0;
4343

integration-tests/lib/sniffer.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,12 @@ impl<'a> Sniffer<'a> {
9595
match TcpStream::connect(upstream_address).await {
9696
Ok(stream) => break stream,
9797
Err(_) => {
98-
println!(
99-
"Sniffer {}: unable to connect to upstream {}, retrying",
100-
identifier, upstream_address
98+
tracing::warn!(
99+
"Sniffer {}: unable to connect to upstream {}, retrying after 1 second",
100+
identifier,
101+
upstream_address
101102
);
103+
tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
102104
}
103105
}
104106
})

integration-tests/lib/sv1_sniffer.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ impl SnifferSV1 {
5959
match TcpStream::connect(upstream_address).await {
6060
Ok(s) => break s,
6161
Err(_) => {
62+
tracing::warn!(
63+
"SnifferSV1: unable to connect to upstream, retrying after 1 second"
64+
);
65+
tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
6266
continue;
6367
}
6468
}

0 commit comments

Comments
 (0)