From 86ff0ae71b56b2197a0db549bc9e20d4623dd324 Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Thu, 26 Oct 2023 14:29:51 -0400 Subject: [PATCH] No longer run processor tests again when testing against 0.17.3.2 Even though the intent was to test against 0.17.3.2, and a Monero 0.17.3.2 node was running, the processor now uses docker which will always use 0.18. Accordingly, while the intent was valid, it was pointless. This is unfortunate, as testing against 0.17 helped protect against edge cases. The infra to preserve their tests isn't worth the benefit we'd gain from said tests however. --- .github/workflows/monero-tests.yaml | 4 +--- processor/src/tests/literal/mod.rs | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/monero-tests.yaml b/.github/workflows/monero-tests.yaml index 5b954fc4..511535b5 100644 --- a/.github/workflows/monero-tests.yaml +++ b/.github/workflows/monero-tests.yaml @@ -56,6 +56,4 @@ jobs: - name: Run Integration Tests # Don't run if the the tests workflow also will if: ${{ matrix.version != 'v0.18.2.0' }} - run: | - GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --all-features --test '*' - GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package serai-processor --all-features monero + run: GITHUB_CI=true RUST_BACKTRACE=1 cargo test --package monero-serai --all-features --test '*' diff --git a/processor/src/tests/literal/mod.rs b/processor/src/tests/literal/mod.rs index fb47bc9b..d2843d84 100644 --- a/processor/src/tests/literal/mod.rs +++ b/processor/src/tests/literal/mod.rs @@ -109,9 +109,13 @@ mod monero { async fn monero(ops: &DockerOperations) -> Monero { let handle = ops.handle("serai-dev-monero").host_port(18081).unwrap(); - // TODO: Replace with a check if the node has booted - tokio::time::sleep(core::time::Duration::from_secs(20)).await; let monero = Monero::new(format!("http://serai:seraidex@{}:{}", handle.0, handle.1)); + for _ in 0 .. 60 { + if monero.get_latest_block_number().await.is_ok() { + break; + } + tokio::time::sleep(core::time::Duration::from_secs(1)).await; + } while monero.get_latest_block_number().await.unwrap() < 150 { monero.mine_block().await; }