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

Add switch from optimistic to normal sync in acceptance tests #6019

Merged
merged 3 commits into from
Aug 6, 2022
Merged

Add switch from optimistic to normal sync in acceptance tests #6019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4511b29
Add switch from optimistic to normal sync to optimistic sync acceptan…
zilm13 Aug 4, 2022
5717790
Merge branch 'master' into tests/non-optimistic-sync
zilm13 Aug 4, 2022
0bd02b1
Merge branch 'master' into tests/non-optimistic-sync
zilm13 Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...ce-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncPostMergeAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ void shouldSwitchToOptimisticSyncAfterMergeWhenExecutionEngineIsSyncing() throws
executionNode2.restartWithEmptyDatabase();

tekuNode2.waitForOptimisticBlock();

// Now make execution node sync and clarify switch from optimistic sync back to the normal
executionNode2.addPeer(executionNode1);
tekuNode2.waitForNonOptimisticBlock();
}

private TekuNode.Config configureTekuNode(
Expand Down
10 changes: 7 additions & 3 deletions ...ce-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncSafeSlotsAcceptanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void setup() throws Exception {
config
.withMiningEnabled(true)
.withMergeSupport(true)
.withP2pEnabled(false)
.withP2pEnabled(true)
.withGenesisFile("besu/preMergeGenesis.json")
.withJwtTokenAuthorization(JWT_FILE));
executionNode1.start();
Expand All @@ -53,7 +53,7 @@ void setup() throws Exception {
config ->
config
.withMergeSupport(true)
.withP2pEnabled(false)
.withP2pEnabled(true)
.withGenesisFile("besu/preMergeGenesis.json")
.withJwtTokenAuthorization(JWT_FILE));
executionNode2.start();
Expand All @@ -75,9 +75,13 @@ void setup() throws Exception {
}

@Test
void shouldPassMergeOptimisticallyAndBeginFinalizationAfterSafeSlotsToImport() {
void shouldPassMergeOptimisticallyAndBeginFinalizationAfterSafeSlotsToImport() throws Exception {
tekuNode2.waitForNonDefaultExecutionPayload();
tekuNode2.waitForOptimisticBlock();

// Now make execution node sync and clarify switch from optimistic sync back to the normal
executionNode2.addPeer(executionNode1);
tekuNode2.waitForNonOptimisticBlock();
}

private TekuNode.Config configureTekuNode(
Expand Down
2 changes: 1 addition & 1 deletion ...-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/BesuDockerVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package tech.pegasys.teku.test.acceptance.dsl;

public enum BesuDockerVersion {
STABLE("22.4.4");
STABLE("22.7.0");

private final String version;

Expand Down