From 09f953a4bd9bcbb9299f0e0bc1bbd339ae15b2d9 Mon Sep 17 00:00:00 2001 From: Manav Darji Date: Tue, 18 Feb 2025 00:40:21 +0530 Subject: [PATCH 1/2] miner: wait for next block before running commit interrupt tests (#1450) The results for the commit interrupt tests via new transactions channel were non-deterministic and used to fail sometimes. This was because we use `w.current` to calculate the delay which needs to be correct for the test to work as expected. It takes a while before `w.current` is updated to the next block (block 3 in this case). This PR adds a small delay so that we have the new block and delays are accurately calculated for the test to work. --- miner/worker_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/miner/worker_test.go b/miner/worker_test.go index 296b2dbca6..fff63b61b5 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -876,6 +876,9 @@ func TestCommitInterruptExperimentBor_NewTxFlow(t *testing.T) { head := <-chainHeadCh // We skip the initial 2 blocks as the mining timings are a bit skewed up if head.Block.NumberU64() == 2 { + // Wait until `w.current` is updated for next block (3) + time.Sleep(100 * time.Millisecond) + // Stop the miner so that worker assumes it's a sentry and not a validator w.stop() From f4f30d9fa3868d84d33ad8c9ac793b77cf457b9e Mon Sep 17 00:00:00 2001 From: Marcello Ardizzone Date: Tue, 18 Feb 2025 21:05:09 +0100 Subject: [PATCH 2/2] Docker scripts in matic-cli (#1453) * use matic-cli docker scripts * revert scripts for cp issue * change dir for int tests --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0988d9f156..6e969f5261 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -236,8 +236,8 @@ jobs: - name: Launch devnet run: | cd matic-cli/devnet - bash ../docker_devnet.sh - cd - + bash ../util-scripts/docker/devnet_setup.sh + cd - timeout 2m bash bor/integration-tests/bor_health.sh - name: Run smoke tests