From 8fbff7fe46aff65de1131d5ac7b361fec5475ffd Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Wed, 10 Jul 2024 08:51:47 +0000 Subject: [PATCH] Update eth-testing fixtures (#28) Updates eth-testing and eth-iterator-utils. Reviewed-on: https://git.vdb.to/cerc-io/plugeth-statediff/pulls/28 --- .gitea/workflows/test.yml | 32 +++++++++++++------------------- go.mod | 4 ++-- go.sum | 8 ++++---- mainnet_tests/builder_test.go | 2 +- utils/iterator_test.go | 2 +- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index e203eec..9c535d7 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -9,8 +9,9 @@ on: - ci-test env: - SO_VERSION: roysc/fix-various - FIXTURENET_ETH_STACKS_VERSION: plugeth-stack + SO_VERSION: v1.1.0-36d4969-202407091537 + FIXTURENET_ETH_STACKS_REF: main + SYSTEM_TESTS_REF: main jobs: unit-tests: @@ -53,23 +54,15 @@ jobs: - name: "Print Python version" run: python3 --version - name: Install stack-orchestrator - # run: | - # curl -L -O https://github.com/cerc-io/stack-orchestrator/releases/download/$SO_VERSION/laconic-so - # chmod +x laconic-so - # echo PATH="$PATH:$(pwd)" >> $GITHUB_ENV - # FIXME: merge SO fixes and revert - uses: actions/checkout@v3 - with: - repository: cerc-io/stack-orchestrator - ref: ${{ env.SO_VERSION }} - path: .tools/stack-orchestrator - - name: "Install stack orchestrator" - run: pip3 install .tools/stack-orchestrator + run: | + curl -L -O https://github.com/cerc-io/stack-orchestrator/releases/download/$SO_VERSION/laconic-so + chmod +x laconic-so + echo PATH="$PATH:$(pwd)" >> $GITHUB_ENV - name: Clone system-tests uses: actions/checkout@v4 with: repository: cerc-io/system-tests - ref: v0.1.0-20240411 + ref: ${{ env.SYSTEM_TESTS_REF }} path: ./system-tests token: ${{ secrets.CICD_REPO_TOKEN }} progress: false @@ -77,7 +70,7 @@ jobs: uses: actions/checkout@v4 with: repository: cerc-io/fixturenet-eth-stacks - ref: ${{ env.FIXTURENET_ETH_STACKS_VERSION }} + ref: ${{ env.FIXTURENET_ETH_STACKS_REF }} path: ./fixturenet-eth-stacks progress: false - name: Run testnet stack @@ -94,13 +87,14 @@ jobs: name: Run compliance tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: ./plugeth-statediff - - uses: actions/checkout@v3 + - name: Check out compliance tests + uses: actions/checkout@v4 with: repository: cerc-io/eth-statediff-compliance - ref: v0.2.0 + ref: v0.3.0 path: ./eth-statediff-compliance token: ${{ secrets.CICD_REPO_TOKEN }} - uses: actions/setup-go@v4 diff --git a/go.mod b/go.mod index 6810234..933af2f 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/cerc-io/plugeth-statediff go 1.21 require ( - github.com/cerc-io/eth-iterator-utils v0.2.0 - github.com/cerc-io/eth-testing v0.4.0 + github.com/cerc-io/eth-iterator-utils v0.3.1 + github.com/cerc-io/eth-testing v0.5.1 github.com/ethereum/go-ethereum v1.13.14 github.com/georgysavva/scany v0.2.9 github.com/golang/mock v1.6.0 diff --git a/go.sum b/go.sum index 314bbfc..af04c7b 100644 --- a/go.sum +++ b/go.sum @@ -35,10 +35,10 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cerc-io/eth-iterator-utils v0.2.0 h1:wikAfWZ0fAqLqUy/Ud/a1n9p/arVeKG8P8tRjZE7oBg= -github.com/cerc-io/eth-iterator-utils v0.2.0/go.mod h1:wDUJvwKDSOdqTIyeG+yXJ2ckzc9f2Fem614fV61DBcg= -github.com/cerc-io/eth-testing v0.4.0 h1:ivGbXnEqlXMt/3m3jbsPJaVT7ZDTenFQWCryt1Rd/Jk= -github.com/cerc-io/eth-testing v0.4.0/go.mod h1:CVsmHjFldX9gwaQSQwGmKbmh0g6Dq+bsqB2CxBf9zbk= +github.com/cerc-io/eth-iterator-utils v0.3.1 h1:h4Bp0+fUiwkyug1uCEO2LZr2qxoW1yKszV2EO/2CDB0= +github.com/cerc-io/eth-iterator-utils v0.3.1/go.mod h1:UNrjsP5bApZkqqqfU7nmnPN/dIIo9GOUUD79tmoX/s4= +github.com/cerc-io/eth-testing v0.5.1 h1:xxcQf9ymJS0911yWIrUiGvCvqfvEjYmHvhBJkCD/whs= +github.com/cerc-io/eth-testing v0.5.1/go.mod h1:p86je2PjSM7u8Qd7rMIG/Zw+tQlBoS5Emkh1ECnC5t0= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= diff --git a/mainnet_tests/builder_test.go b/mainnet_tests/builder_test.go index f16ce51..3e1ab97 100644 --- a/mainnet_tests/builder_test.go +++ b/mainnet_tests/builder_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/cerc-io/eth-testing/chaindata/mainnet" + "github.com/cerc-io/eth-testing/chains/mainnet" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/core" diff --git a/utils/iterator_test.go b/utils/iterator_test.go index 76ebcd6..7833a6c 100644 --- a/utils/iterator_test.go +++ b/utils/iterator_test.go @@ -3,7 +3,7 @@ package utils_test import ( "testing" - "github.com/cerc-io/eth-testing/chaindata/mainnet" + "github.com/cerc-io/eth-testing/chains/mainnet" "github.com/ethereum/go-ethereum/consensus/ethash" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/rawdb"