-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into reduce_dirty_space
- Loading branch information
Showing
144 changed files
with
3,485 additions
and
2,243 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| #!/bin/bash | ||
|
|
||
| set +e # Disable exit on error | ||
|
|
||
| # Array of disabled tests | ||
| disabled_tests=( | ||
| # Erigon2 and Erigon3 never supported this api methods | ||
| trace_rawTransaction | ||
| # remove these lines after https://github.com/erigontech/rpc-tests/pull/284 and https://github.com/erigontech/erigon/pull/12655 | ||
| eth_feeHistory/test_12.json | ||
| eth_feeHistory/test_13.json | ||
| eth_feeHistory/test_15.json | ||
| eth_feeHistory/test_16.json | ||
| eth_feeHistory/test_17.json | ||
| eth_feeHistory/test_18.json | ||
| eth_feeHistory/test_19.json | ||
| eth_feeHistory/test_20.json | ||
| # total difficulty field was removed, then added back | ||
| # remove this line after https://github.com/erigontech/rpc-tests/pull/282 | ||
| eth_getBlockByHash/test_10.json | ||
| eth_getBlockByNumber/test_12.json | ||
| # Erigon bugs | ||
| debug_accountRange,debug_storageRangeAt | ||
| # need update rpc-test - because Erigon is correct (@AskAlexSharov will do after https://github.com/erigontech/erigon/pull/12634) | ||
| # remove this line after https://github.com/erigontech/rpc-tests/pull/273 | ||
| debug_getModifiedAccountsByHash,debug_getModifiedAccountsByNumber | ||
| # Erigon bug https://github.com/erigontech/erigon/issues/12603 | ||
| erigon_getLatestLogs,erigon_getLogsByHash/test_04.json | ||
| # Erigon bug https://github.com/erigontech/erigon/issues/12637 | ||
| debug_traceBlockByNumber/test_05.tar | ||
| debug_traceBlockByNumber/test_08.tar | ||
| debug_traceBlockByNumber/test_09.tar | ||
| debug_traceBlockByNumber/test_10.tar | ||
| debug_traceBlockByNumber/test_11.tar | ||
| debug_traceBlockByNumber/test_12.tar | ||
| # remove this line after https://github.com/erigontech/rpc-tests/pull/281 | ||
| parity_getBlockReceipts | ||
| parity_listStorageKeys/test_12.json | ||
| # to investigate | ||
| debug_traceCallMany/test_02.tar | ||
| debug_traceCallMany/test_04.tar | ||
| debug_traceCallMany/test_05.tar | ||
| debug_traceCallMany/test_06.tar | ||
| debug_traceCallMany/test_07.tar | ||
| debug_traceCallMany/test_09.json | ||
| debug_traceCallMany/test_10.tar | ||
| engine_exchangeCapabilities/test_1.json | ||
| engine_exchangeTransitionConfigurationV1/test_01.json | ||
| engine_getClientVersionV1/test_1.json | ||
| erigon_getBalanceChangesInBlock | ||
| trace_replayBlockTransactions/test_29.tar | ||
| # do these perhaps require Erigon up? | ||
| admin_nodeInfo/test_01.json | ||
| admin_peers/test_01.json | ||
| erigon_nodeInfo/test_1.json | ||
| eth_coinbase/test_01.json | ||
| eth_createAccessList/test_16.json | ||
| eth_getTransactionByHash/test_02.json | ||
| eth_getWork/test_01.json | ||
| eth_mining/test_01.json | ||
| eth_protocolVersion/test_1.json | ||
| eth_submitHashrate/test_1.json | ||
| eth_submitWork/test_1.json | ||
| net_peerCount/test_1.json | ||
| net_version/test_1.json | ||
| txpool_status/test_1.json | ||
| web3_clientVersion/test_1.json) | ||
|
|
||
| # Transform the array into a comma-separated string | ||
| disabled_test_list=$(IFS=,; echo "${disabled_tests[*]}") | ||
|
|
||
| python3 ./run_tests.py -p 8545 --continue -f --json-diff -x "$disabled_test_list" | ||
|
|
||
| exit $? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| name: Hive EEST tests | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - release/* | ||
| - main | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| test-hive-eest: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout Hive | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| repository: danceratopz/hive | ||
| ref: prague-devnet-4 | ||
| path: hive | ||
| - name: Setup go env and cache | ||
| uses: actions/setup-go@v5 | ||
| with: | ||
| go-version: '>=1.22' | ||
| go-version-file: 'hive/go.mod' | ||
|
|
||
| # Targetting the clients/erigon/Dockerfile.git in the Hive director - | ||
| # this builds the container from github and uses it for tests | ||
| - name: Get dependencies and build hive | ||
| run: | | ||
| cd hive | ||
| git status | ||
| go get . >> buildlogs.log | ||
| rm clients/erigon/Dockerfile | ||
| mv clients/erigon/Dockerfile.git clients/erigon/Dockerfile | ||
| branch_name=$(echo ${GITHUB_REF#refs/heads/} | sed 's/[&/\]/\\&/g') | ||
| echo Building Hive with Erigon branch - $branch_name | ||
| sed -i "s/^ARG github=ledgerwatch\/erigon$/ARG github=erigontech\/erigon/" clients/erigon/Dockerfile | ||
| sed -i "s/^ARG tag=main$/ARG tag=${branch_name}/" clients/erigon/Dockerfile | ||
| if [[ "$branch_name" != "main" ]]; then | ||
| sed -i "/$sync.parallel-state-flushing/d" clients/erigon/erigon.sh | ||
| fi | ||
| go build . >> buildlogs.log | ||
| # Depends on the last line of hive output that prints the number of suites, tests and failed | ||
| # Currently, we fail even if suites and tests are too few, indicating the tests did not run | ||
| # We also fail if more than half the tests fail | ||
| - name: Run hive tests and parse output | ||
| run: | | ||
| cd hive | ||
| run_suite() { | ||
| echo -e "\n\n============================================================" | ||
| echo "Running test: ${1}" | ||
| echo -e "\n" | ||
| ./hive --sim 'ethereum/eest/consume-engine' --client erigon 2>&1 | tee output.log || { | ||
| if [ $? -gt 0 ]; then | ||
| echo "Exitcode gt 0" | ||
| fi | ||
| } | ||
| status_line=$(tail -2 output.log | head -1 | sed -r "s/\x1B\[[0-9;]*[a-zA-Z]//g") | ||
| suites=$(echo "$status_line" | sed -n 's/.*suites=\([0-9]*\).*/\1/p') | ||
| if [ -z "$suites" ]; then | ||
| status_line=$(tail -1 output.log | sed -r "s/\x1B\[[0-9;]*[a-zA-Z]//g") | ||
| suites=$(echo "$status_line" | sed -n 's/.*suites=\([0-9]*\).*/\1/p') | ||
| fi | ||
| tests=$(echo "$status_line" | sed -n 's/.*tests=\([0-9]*\).*/\1/p') | ||
| failed=$(echo "$status_line" | sed -n 's/.*failed=\([0-9]*\).*/\1/p') | ||
| echo -e "\n" | ||
| echo "----------- Results for ${1} -----------" | ||
| echo "Tests: $tests, Failed: $failed" | ||
| echo -e "\n\n============================================================" | ||
| if (( tests < 4 )); then | ||
| echo "Too few tests run for suite ${1} - ${tests} tests" | ||
| exit 1 | ||
| fi | ||
| if (( failed*2 > tests )); then | ||
| echo "Too many failures for suite ${1} - ${failed} failed out of ${tests}" | ||
| exit 1 | ||
| fi | ||
| } | ||
| run_suite eest/consume-engine |
Oops, something went wrong.