Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace geth binary in sim merge tests with docker #4629

Merged
merged 6 commits into from
Oct 3, 2022
Merged

Replace geth binary in sim merge tests with docker #4629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f64926
Replace geth binary in sim merge with docker image
g11tech Oct 3, 2022
9fbe050
fix image check
g11tech Oct 3, 2022
e48fad2
try fixing geth env image input
g11tech Oct 3, 2022
731ba4a
reduce lead time to genesis to 5 slots
g11tech Oct 3, 2022
133e083
increase lead time a bit
g11tech Oct 3, 2022
d7d9645
icnorporate suggestion
g11tech Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 5 additions & 11 deletions .github/workflows/test-sim-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_dispatch:

env:
GETH_COMMIT: 511bf8f18801520bf4e0c7e4d098a17d0665bc89
GETH_IMAGE: ethereum/client-go:v1.10.25
NETHERMIND_COMMIT: 5b73a2771ed00c6be792fc46f8d5c56333a28b11

jobs:
Expand Down Expand Up @@ -40,21 +40,15 @@ jobs:
if: steps.cache-deps.outputs.cache-hit == 'true'
# </common-build>

# Install Geth merge interop
- uses: actions/setup-go@v2
with:
go-version: '1.17'
- name: Clone Geth merge interop branch
run: git clone -b master https://github.com/g11tech/go-ethereum.git && cd go-ethereum && git reset --hard $GETH_COMMIT && git submodule update --init --recursive
- name: Build Geth
run: cd go-ethereum && make
- name: Pull Geth
run: docker pull $GETH_IMAGE

- name: Test Lodestar <> Geth interop
run: yarn test:sim:merge-interop
working-directory: packages/beacon-node
env:
EL_BINARY_DIR: ../../go-ethereum/build/bin
EL_SCRIPT_DIR: geth
EL_BINARY_DIR: ${{ env.GETH_IMAGE }}
EL_SCRIPT_DIR: gethdocker
ENGINE_PORT: 8551
ETH_PORT: 8545
TX_SCENARIOS: simple
Expand Down
2 changes: 1 addition & 1 deletion packages/beacon-node/test/sim/merge-interop.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ describe("executionEngine / ExecutionEngineHttp", function () {
const timeoutSetupMargin = 30 * 1000; // Give extra 30 seconds of margin

// delay a bit so regular sync sees it's up to date and sync is completed from the beginning
const genesisSlotsDelay = 30;
const genesisSlotsDelay = 8;

const timeout =
((epochsOfMargin + expectedEpochsToFinish) * SLOTS_PER_EPOCH + genesisSlotsDelay) *
Expand Down