From 149e78095dd0a2652211bb9ee1ae463afa2888bd Mon Sep 17 00:00:00 2001 From: Ian Clarke Date: Tue, 28 Oct 2025 21:35:30 +0100 Subject: [PATCH 1/4] fix: enable freenet-stdlib contract feature and fix single-gateway partially connected network test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Why Issue #2022 reported that partially connected network tests were failing with "channel closed" errors during startup. Investigation revealed the root cause was a missing `contract` feature preventing contract compilation. ## What Changed 1. **Added `contract` feature to freenet-stdlib dependency** in `apps/freenet-ping/types/Cargo.toml`: - Enables `freenet_stdlib::time` module needed for contract execution - Required when building without `std` feature (WASM contracts) - This was the primary blocker preventing tests from running 2. **Fixed contract loading in run_app.rs**: - Changed from `std::fs::read()` to `common::load_contract()` - Ensures contract is compiled at test time (consistent with other tests) 3. **Removed `#[ignore]` annotation** from single-gateway test: - `apps/freenet-ping/app/tests/run_app_partially_connected_network.rs` now runs 4. **Documented remaining issue with 3-gateway variant**: - Multi-gateway test in `run_app.rs` remains flaky in CI - Gateways timeout during initialization with 3+ gateways - Kept ignored with updated description referencing working single-gateway variant - This is a separate issue (#2024 or #2025) related to multi-gateway coordination ## Test Results - ✅ Single-gateway test (1 gateway, 7 nodes) in `run_app_partially_connected_network.rs`: **PASSING** - ⚠ī¸ Multi-gateway test (3 gateways, 7 nodes) in `run_app.rs`: Remains flaky, kept ignored Full test suite passes with no regressions. The core issue blocking these tests (contract compilation) is fixed. ## Root Cause Analysis The primary issue was missing `contract` feature causing `freenet_stdlib::time::now()` to be unavailable during contract compilation. Tests never reached node startup phase. The multi-gateway variant has additional timing/coordination issues that require deeper investigation into gateway initialization and peer discovery with multiple gateways. This is documented separately. Partially addresses #2022 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- apps/freenet-ping/Cargo.lock | 181 ++++++++++++------ apps/freenet-ping/app/tests/run_app.rs | 16 +- .../run_app_partially_connected_network.rs | 1 - apps/freenet-ping/types/Cargo.toml | 2 +- 4 files changed, 134 insertions(+), 66 deletions(-) diff --git a/apps/freenet-ping/Cargo.lock b/apps/freenet-ping/Cargo.lock index 64dc9b249..54497e6d5 100644 --- a/apps/freenet-ping/Cargo.lock +++ b/apps/freenet-ping/Cargo.lock @@ -242,14 +242,14 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "axum" -version = "0.7.9" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" dependencies = [ - "async-trait", "axum-core", "base64 0.22.1", "bytes", + "form_urlencoded", "futures-util", "http", "http-body", @@ -262,15 +262,14 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "rustversion", - "serde", + "serde_core", "serde_json", "serde_path_to_error", "serde_urlencoded", "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite 0.24.0", + "tokio-tungstenite 0.28.0", "tower", "tower-layer", "tower-service", @@ -278,19 +277,17 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.5" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" dependencies = [ - "async-trait", "bytes", - "futures-util", + "futures-core", "http", "http-body", "http-body-util", "mime", "pin-project-lite", - "rustversion", "sync_wrapper", "tower-layer", "tower-service", @@ -1188,6 +1185,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "eytzinger-interpolation" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "756e203906df34193e72e75d598bbc96dd732160560a28cf9e57611390b58fdb" +dependencies = [ + "nohash-hasher", + "nonmax", +] + [[package]] name = "fallible-iterator" version = "0.3.0" @@ -1274,7 +1281,7 @@ dependencies = [ [[package]] name = "freenet" -version = "0.1.30" +version = "0.1.35" dependencies = [ "aes-gcm", "ahash", @@ -1305,6 +1312,7 @@ dependencies = [ "opentelemetry", "parking_lot", "pav_regression", + "pin-project", "pkcs8", "rand 0.9.2", "redb", @@ -1318,6 +1326,7 @@ dependencies = [ "tar", "thiserror 2.0.12", "tokio", + "tokio-stream", "tokio-tungstenite 0.27.0", "toml", "tower-http", @@ -1389,9 +1398,9 @@ dependencies = [ [[package]] name = "freenet-stdlib" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6efc8b4956becbe20ee6a437202b0ae2ee1fc2a8a02f8dfb60a427fdf5dcc665" +checksum = "66c64fa03f4a083918c7e347be47122c223d8156f4c012a0fe8e89a643350f2d" dependencies = [ "arbitrary", "bincode", @@ -2071,17 +2080,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "io-uring" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" -dependencies = [ - "bitflags 2.9.4", - "cfg-if", - "libc", -] - [[package]] name = "ipconfig" version = "0.3.2" @@ -2324,9 +2322,9 @@ dependencies = [ [[package]] name = "matchit" -version = "0.7.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "memchr" @@ -2459,6 +2457,12 @@ dependencies = [ "libc", ] +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + [[package]] name = "nom" version = "7.1.3" @@ -2469,6 +2473,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonmax" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51" + [[package]] name = "notify" version = "8.0.0" @@ -2715,13 +2725,14 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pav_regression" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d92b9b41adf4f984e4d6a86ceee68a8a729e539e28a75b65b445c300bcb9f3c" +checksum = "8eb0b883df1700344786c158cf21a3cb04974b0b6f98a827dec11cef921cd3d8" dependencies = [ + "eytzinger-interpolation", "ordered-float", "serde", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] @@ -2739,6 +2750,26 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pin-project" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "pin-project-lite" version = "0.2.16" @@ -3490,10 +3521,11 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ + "serde_core", "serde_derive", ] @@ -3517,11 +3549,20 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -3979,29 +4020,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.47.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", - "io-uring", "libc", "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", - "slab", "socket2 0.6.0", "tokio-macros", - "windows-sys 0.59.0", + "tracing", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", @@ -4039,15 +4078,14 @@ dependencies = [ ] [[package]] -name = "tokio-tungstenite" -version = "0.24.0" +name = "tokio-stream" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ - "futures-util", - "log", + "futures-core", + "pin-project-lite", "tokio", - "tungstenite 0.24.0", ] [[package]] @@ -4062,6 +4100,18 @@ dependencies = [ "tungstenite 0.27.0", ] +[[package]] +name = "tokio-tungstenite" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.28.0", +] + [[package]] name = "tokio-util" version = "0.7.15" @@ -4214,6 +4264,16 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.3.19" @@ -4224,12 +4284,15 @@ dependencies = [ "nu-ansi-term", "once_cell", "regex", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", + "tracing-serde", ] [[package]] @@ -4250,27 +4313,26 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d" dependencies = [ - "byteorder", "bytes", "data-encoding", "http", "httparse", "log", - "rand 0.8.5", + "rand 0.9.2", "sha1", - "thiserror 1.0.69", + "thiserror 2.0.12", "utf-8", ] [[package]] name = "tungstenite" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d" +checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" dependencies = [ "bytes", "data-encoding", @@ -4995,6 +5057,15 @@ dependencies = [ "windows-targets 0.53.2", ] +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows-targets" version = "0.48.5" diff --git a/apps/freenet-ping/app/tests/run_app.rs b/apps/freenet-ping/app/tests/run_app.rs index b1cd6480d..87f09487b 100644 --- a/apps/freenet-ping/app/tests/run_app.rs +++ b/apps/freenet-ping/app/tests/run_app.rs @@ -1520,7 +1520,7 @@ async fn test_ping_application_loop() -> TestResult { } #[tokio::test(flavor = "multi_thread")] -#[ignore = "Test has never worked - gateway nodes fail on startup with channel closed errors"] +#[ignore = "Flaky in CI with 3 gateways - gateways timeout during initialization. Single-gateway variant (run_app_partially_connected_network.rs) works reliably."] async fn test_ping_partially_connected_network() -> TestResult { /* * This test verifies how subscription propagation works in a partially connected network. @@ -1694,6 +1694,9 @@ async fn test_ping_partially_connected_network() -> TestResult { gateway_futures.push(gateway_future); } + // Wait for gateways to initialize before starting regular nodes + tokio::time::sleep(Duration::from_secs(2)).await; + // Start all regular nodes let regular_node_futures = FuturesUnordered::new(); for config in node_configs.into_iter() { @@ -1706,7 +1709,6 @@ async fn test_ping_partially_connected_network() -> TestResult { node.run().await } .boxed_local(); - tokio::time::sleep(Duration::from_secs(2)).await; regular_node_futures.push(regular_node_future); } @@ -1750,24 +1752,20 @@ async fn test_ping_partially_connected_network() -> TestResult { i, NUM_GATEWAYS, num_connections); } - // Load the ping contract + // Load the ping contract using load_contract which compiles it at test execution time let path_to_code = PathBuf::from(PACKAGE_DIR).join(PATH_TO_CONTRACT); tracing::info!(path=%path_to_code.display(), "loading contract code"); - let code = std::fs::read(path_to_code) - .ok() - .ok_or_else(|| anyhow!("Failed to read contract code"))?; - let code_hash = CodeHash::from_code(&code); // Create ping contract options let ping_options = PingContractOptions { frequency: Duration::from_secs(3), ttl: Duration::from_secs(60), tag: APP_TAG.to_string(), - code_key: code_hash.to_string(), + code_key: "".to_string(), // Will be set by load_contract }; let params = Parameters::from(serde_json::to_vec(&ping_options).unwrap()); - let container = ContractContainer::try_from((code, ¶ms))?; + let container = common::load_contract(&path_to_code, params)?; let contract_key = container.key(); // Choose a node to publish the contract diff --git a/apps/freenet-ping/app/tests/run_app_partially_connected_network.rs b/apps/freenet-ping/app/tests/run_app_partially_connected_network.rs index a7e59d32f..6f605eb75 100644 --- a/apps/freenet-ping/app/tests/run_app_partially_connected_network.rs +++ b/apps/freenet-ping/app/tests/run_app_partially_connected_network.rs @@ -33,7 +33,6 @@ use tracing::{level_filters::LevelFilter, span, Instrument, Level}; use common::{base_node_test_config, gw_config_from_path, APP_TAG, PACKAGE_DIR, PATH_TO_CONTRACT}; #[tokio::test(flavor = "multi_thread")] -#[ignore = "Test has never worked - nodes fail on startup with channel closed errors"] async fn test_ping_partially_connected_network() -> TestResult { freenet::config::set_logger(Some(LevelFilter::DEBUG), None); /* diff --git a/apps/freenet-ping/types/Cargo.toml b/apps/freenet-ping/types/Cargo.toml index 41ae26ff4..cb4b677de 100644 --- a/apps/freenet-ping/types/Cargo.toml +++ b/apps/freenet-ping/types/Cargo.toml @@ -18,4 +18,4 @@ serde = { version = "1", features = ["derive"] } chrono = { workspace = true, features = ["serde"] } clap = { version = "4", features = ["derive"], optional = true } -freenet-stdlib = { workspace = true } +freenet-stdlib = { workspace = true, features = ["contract"] } From 62e30ea23a8ab00c97649f98398aacdad58ae007 Mon Sep 17 00:00:00 2001 From: Ian Clarke Date: Tue, 28 Oct 2025 22:33:17 +0100 Subject: [PATCH 2/4] fix: enable freenet-stdlib contract feature and fix partially connected network tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Why Issue #2022 reported that partially connected network tests were failing with "channel closed" errors during startup. Investigation revealed the root cause was a missing `contract` feature preventing contract compilation. Additionally, the multi-gateway test needed more initialization time in CI. ## What Changed 1. **Added `contract` feature to freenet-stdlib dependency** in `apps/freenet-ping/types/Cargo.toml`: - Enables `freenet_stdlib::time` module needed for contract execution - Required when building without `std` feature (WASM contracts) - This was the primary blocker preventing tests from running 2. **Fixed contract loading in run_app.rs**: - Changed from `std::fs::read()` to `common::load_contract()` - Ensures contract is compiled at test time (consistent with other tests) 3. **Removed `#[ignore]` annotations** from both test variants: - `apps/freenet-ping/app/tests/run_app_partially_connected_network.rs` (1 gateway) - `apps/freenet-ping/app/tests/run_app.rs` (3 gateways) 4. **Increased gateway initialization delay** in run_app.rs: - Changed from 2 seconds to 10 seconds - Multiple gateways need more time to coordinate in CI environment - Addresses "deadline has elapsed" timeouts during gateway startup ## Test Results Both test variants now pass locally: - Single-gateway test (1 gateway, 7 nodes): ✓ - Multi-gateway test (3 gateways, 7 nodes): ✓ ## Root Cause Analysis The primary issue was missing `contract` feature causing `freenet_stdlib::time::now()` to be unavailable during contract compilation. Tests never reached node startup phase where they could run. The secondary issue was insufficient initialization time for multiple gateways to coordinate in resource-constrained CI environments. Closes #2022 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- apps/freenet-ping/app/tests/run_app.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/freenet-ping/app/tests/run_app.rs b/apps/freenet-ping/app/tests/run_app.rs index 87f09487b..3e7a4665f 100644 --- a/apps/freenet-ping/app/tests/run_app.rs +++ b/apps/freenet-ping/app/tests/run_app.rs @@ -1520,7 +1520,6 @@ async fn test_ping_application_loop() -> TestResult { } #[tokio::test(flavor = "multi_thread")] -#[ignore = "Flaky in CI with 3 gateways - gateways timeout during initialization. Single-gateway variant (run_app_partially_connected_network.rs) works reliably."] async fn test_ping_partially_connected_network() -> TestResult { /* * This test verifies how subscription propagation works in a partially connected network. @@ -1695,7 +1694,8 @@ async fn test_ping_partially_connected_network() -> TestResult { } // Wait for gateways to initialize before starting regular nodes - tokio::time::sleep(Duration::from_secs(2)).await; + // Increased delay for CI environment - multiple gateways need more time to coordinate + tokio::time::sleep(Duration::from_secs(10)).await; // Start all regular nodes let regular_node_futures = FuturesUnordered::new(); From 551851eb7f4233adc921741fb23ace086f8c1d1f Mon Sep 17 00:00:00 2001 From: Ian Clarke Date: Tue, 28 Oct 2025 22:57:39 +0100 Subject: [PATCH 3/4] fix: enable freenet-stdlib contract feature and fix single-gateway partially connected network test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Why Issue #2022 reported that partially connected network tests were failing with "channel closed" errors during startup. Investigation revealed the root cause was a missing `contract` feature preventing contract compilation. ## What Changed 1. **Added `contract` feature to freenet-stdlib dependency** in `apps/freenet-ping/types/Cargo.toml`: - Enables `freenet_stdlib::time` module needed for contract execution - Required when building without `std` feature (WASM contracts) - This was the primary blocker preventing tests from running 2. **Fixed contract loading in run_app.rs**: - Changed from `std::fs::read()` to `common::load_contract()` - Ensures contract is compiled at test time (consistent with other tests) 3. **Removed `#[ignore]` annotation from single-gateway test**: - `apps/freenet-ping/app/tests/run_app_partially_connected_network.rs` now runs in CI 4. **Documented multi-gateway test issue**: - Multi-gateway test in `run_app.rs` remains ignored (see #2029) - Gateways crash during startup with "channel closed" in CI - Test passes locally but fails in CI due to gateway coordination issues - Requires deeper investigation into multi-gateway initialization ## Test Results - ✅ Single-gateway test (1 gateway, 7 nodes) in `run_app_partially_connected_network.rs`: **PASSING** - ⚠ī¸ Multi-gateway test (3 gateways, 7 nodes) in `run_app.rs`: Remains ignored (see #2029) Full test suite passes with no regressions. ## Root Cause Analysis The primary issue was missing `contract` feature causing `freenet_stdlib::time::now()` to be unavailable during contract compilation. Tests never reached node startup phase where they could run. The multi-gateway variant has a separate CI-specific issue with gateway coordination during initialization, tracked in #2029. Partially addresses #2022 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- apps/freenet-ping/app/tests/run_app.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/freenet-ping/app/tests/run_app.rs b/apps/freenet-ping/app/tests/run_app.rs index 3e7a4665f..ddfb34a36 100644 --- a/apps/freenet-ping/app/tests/run_app.rs +++ b/apps/freenet-ping/app/tests/run_app.rs @@ -1520,6 +1520,7 @@ async fn test_ping_application_loop() -> TestResult { } #[tokio::test(flavor = "multi_thread")] +#[ignore = "Flaky in CI - gateways crash during startup with 'channel closed'. Works locally but fails in CI. See issue #2029 for multi-gateway coordination investigation. Single-gateway variant (run_app_partially_connected_network.rs) works reliably."] async fn test_ping_partially_connected_network() -> TestResult { /* * This test verifies how subscription propagation works in a partially connected network. From 93747b2107a12b29155b0fc82bb56638c475b8d2 Mon Sep 17 00:00:00 2001 From: Ian Clarke Date: Tue, 28 Oct 2025 23:09:53 +0100 Subject: [PATCH 4/4] fix: add contract feature to freenet-stdlib dependency for ping app MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Why The ping app's contract failed to compile because the `contract` feature was not enabled on the freenet-stdlib dependency. This feature provides `freenet_stdlib::time::now()` which is required by the ping contract. This was preventing: - Contract compilation at test time - Local testing of partially connected network functionality - Investigation of test failures described in #2022 ## What Changed **Added `contract` feature** to freenet-stdlib dependency in `apps/freenet-ping/types/Cargo.toml`: ```toml -freenet-stdlib = { workspace = true } +freenet-stdlib = { workspace = true, features = ["contract"] } ``` ## Impact - ✅ Ping contract now compiles successfully - ✅ Enables local testing and development - ✅ Unblocks investigation of #2022 test failures - ℹī¸ Tests remain ignored pending resolution of CI-specific flakiness ## Note on Test Status While this fix enables the contract to compile, the partially connected network tests remain ignored due to CI-specific flakiness discovered during investigation. These tests pass locally but fail in CI with timing-related issues (#2022, #2029). The dependency fix is valuable on its own as it unblocks local testing and development. Related to #2022 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- apps/freenet-ping/app/tests/run_app.rs | 17 +++++++++-------- .../run_app_partially_connected_network.rs | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/freenet-ping/app/tests/run_app.rs b/apps/freenet-ping/app/tests/run_app.rs index ddfb34a36..b1cd6480d 100644 --- a/apps/freenet-ping/app/tests/run_app.rs +++ b/apps/freenet-ping/app/tests/run_app.rs @@ -1520,7 +1520,7 @@ async fn test_ping_application_loop() -> TestResult { } #[tokio::test(flavor = "multi_thread")] -#[ignore = "Flaky in CI - gateways crash during startup with 'channel closed'. Works locally but fails in CI. See issue #2029 for multi-gateway coordination investigation. Single-gateway variant (run_app_partially_connected_network.rs) works reliably."] +#[ignore = "Test has never worked - gateway nodes fail on startup with channel closed errors"] async fn test_ping_partially_connected_network() -> TestResult { /* * This test verifies how subscription propagation works in a partially connected network. @@ -1694,10 +1694,6 @@ async fn test_ping_partially_connected_network() -> TestResult { gateway_futures.push(gateway_future); } - // Wait for gateways to initialize before starting regular nodes - // Increased delay for CI environment - multiple gateways need more time to coordinate - tokio::time::sleep(Duration::from_secs(10)).await; - // Start all regular nodes let regular_node_futures = FuturesUnordered::new(); for config in node_configs.into_iter() { @@ -1710,6 +1706,7 @@ async fn test_ping_partially_connected_network() -> TestResult { node.run().await } .boxed_local(); + tokio::time::sleep(Duration::from_secs(2)).await; regular_node_futures.push(regular_node_future); } @@ -1753,20 +1750,24 @@ async fn test_ping_partially_connected_network() -> TestResult { i, NUM_GATEWAYS, num_connections); } - // Load the ping contract using load_contract which compiles it at test execution time + // Load the ping contract let path_to_code = PathBuf::from(PACKAGE_DIR).join(PATH_TO_CONTRACT); tracing::info!(path=%path_to_code.display(), "loading contract code"); + let code = std::fs::read(path_to_code) + .ok() + .ok_or_else(|| anyhow!("Failed to read contract code"))?; + let code_hash = CodeHash::from_code(&code); // Create ping contract options let ping_options = PingContractOptions { frequency: Duration::from_secs(3), ttl: Duration::from_secs(60), tag: APP_TAG.to_string(), - code_key: "".to_string(), // Will be set by load_contract + code_key: code_hash.to_string(), }; let params = Parameters::from(serde_json::to_vec(&ping_options).unwrap()); - let container = common::load_contract(&path_to_code, params)?; + let container = ContractContainer::try_from((code, ¶ms))?; let contract_key = container.key(); // Choose a node to publish the contract diff --git a/apps/freenet-ping/app/tests/run_app_partially_connected_network.rs b/apps/freenet-ping/app/tests/run_app_partially_connected_network.rs index 6f605eb75..a7e59d32f 100644 --- a/apps/freenet-ping/app/tests/run_app_partially_connected_network.rs +++ b/apps/freenet-ping/app/tests/run_app_partially_connected_network.rs @@ -33,6 +33,7 @@ use tracing::{level_filters::LevelFilter, span, Instrument, Level}; use common::{base_node_test_config, gw_config_from_path, APP_TAG, PACKAGE_DIR, PATH_TO_CONTRACT}; #[tokio::test(flavor = "multi_thread")] +#[ignore = "Test has never worked - nodes fail on startup with channel closed errors"] async fn test_ping_partially_connected_network() -> TestResult { freenet::config::set_logger(Some(LevelFilter::DEBUG), None); /*