From 2f4295d473f5044ff9939b4087520e38df703bcb Mon Sep 17 00:00:00 2001 From: janniks Date: Fri, 2 Aug 2024 16:48:45 +0200 Subject: [PATCH] chore: update --- .github/workflows/run-regtest-tests.yml | 4 ++-- src/tests/regtest.test.ts | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-regtest-tests.yml b/.github/workflows/run-regtest-tests.yml index 2c9767a..d94a1f0 100644 --- a/.github/workflows/run-regtest-tests.yml +++ b/.github/workflows/run-regtest-tests.yml @@ -54,8 +54,8 @@ jobs: cd /tmp/regtest-env sed -i 's/\(&STACKS_BLOCKCHAIN_COMMIT \).*/\1${{ github.event.inputs.core_commit || 'develop' }}/' docker-compose.yml sed -i 's/\(&MINE_INTERVAL_EPOCH25 \).*/\12s/' docker-compose.yml - sed -i 's/\(&MINE_INTERVAL_EPOCH3 \).*/\17s/' docker-compose.yml - sed -i 's/\(&&NAKAMOTO_BLOCK_INTERVAL \).*/\13s/' docker-compose.yml + sed -i 's/\(&MINE_INTERVAL_EPOCH3 \).*/\16s/' docker-compose.yml + sed -i 's/\(&&NAKAMOTO_BLOCK_INTERVAL \).*/\14s/' docker-compose.yml docker compose build cat << EOF >> stacks-krypton-miner.toml # DEVNET WALLETS diff --git a/src/tests/regtest.test.ts b/src/tests/regtest.test.ts index 6179205..cb16ce1 100644 --- a/src/tests/regtest.test.ts +++ b/src/tests/regtest.test.ts @@ -139,7 +139,6 @@ describe('regtest-env pox-4', () => { if (ENV.SKIP_UNLOCK) return; await waitForBurnBlockHeight(info.details.unlock_height + 2); - await timeout(400); info = await client.getStatus(); expect(info.stacked).toBeFalsy(); @@ -217,10 +216,9 @@ describe('regtest-env pox-4', () => { .map(r => r.data) .filter(d => d.signer_key.includes(signer.signerPublicKey)); - // todo: this is incorrect on the stacks-node side currently, it shouldn't have the prepare offset included yet expect(datas).toContainEqual( expect.objectContaining({ - start_cycle_id: (nextCycle + 1).toString(), // + prepare offset + start_cycle_id: nextCycle.toString(), end_cycle_id: (nextCycle + lockPeriod).toString(), }) );