From e84dcb7b06232d8331b9358b4a5fc2dce7f031fa Mon Sep 17 00:00:00 2001 From: Stefan Bratanov Date: Tue, 14 Nov 2023 09:29:18 +0000 Subject: [PATCH] small nit --- .../acceptance/BellatrixMergeTransitionAcceptanceTest.java | 2 +- .../teku/test/acceptance/CapellaUpgradeAcceptanceTest.java | 4 ++-- .../test/acceptance/DoppelgangerDetectorAcceptanceTest.java | 2 +- .../teku/test/acceptance/MergedGenesisAcceptanceTest.java | 2 +- .../acceptance/OptimisticSyncPostMergeAcceptanceTest.java | 4 ++-- .../acceptance/OptimisticSyncSafeSlotsAcceptanceTest.java | 4 ++-- .../teku/test/acceptance/SyncingStatusAcceptanceTest.java | 2 +- .../acceptance/WebsocketsMergeTransitionAcceptanceTest.java | 2 +- .../java/tech/pegasys/teku/test/acceptance/dsl/BesuNode.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/BellatrixMergeTransitionAcceptanceTest.java b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/BellatrixMergeTransitionAcceptanceTest.java index 8dc1ca86cf4..11c03aa34e4 100644 --- a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/BellatrixMergeTransitionAcceptanceTest.java +++ b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/BellatrixMergeTransitionAcceptanceTest.java @@ -41,7 +41,7 @@ void setup() throws Exception { config -> config .withMiningEnabled(true) - .withMergeSupport(true) + .withMergeSupport() .withGenesisFile("besu/preMergeGenesis.json") .withJwtTokenAuthorization(JWT_FILE)); eth1Node.start(); diff --git a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java index 170a405a650..c3d113b9346 100644 --- a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java +++ b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java @@ -50,7 +50,7 @@ void shouldUpgradeToCapella() throws Exception { BesuDockerVersion.STABLE, config -> config - .withMergeSupport(true) + .withMergeSupport() .withGenesisFile("besu/mergedGenesis.json") .withP2pEnabled(true) .withJwtTokenAuthorization(JWT_FILE), @@ -62,7 +62,7 @@ void shouldUpgradeToCapella() throws Exception { BesuDockerVersion.STABLE, config -> config - .withMergeSupport(true) + .withMergeSupport() .withGenesisFile("besu/mergedGenesis.json") .withP2pEnabled(true) .withJwtTokenAuthorization(JWT_FILE), diff --git a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/DoppelgangerDetectorAcceptanceTest.java b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/DoppelgangerDetectorAcceptanceTest.java index 4ef5ec61d5e..aa12a51ded6 100644 --- a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/DoppelgangerDetectorAcceptanceTest.java +++ b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/DoppelgangerDetectorAcceptanceTest.java @@ -42,7 +42,7 @@ void setUp() { config -> config .withMiningEnabled(true) - .withMergeSupport(true) + .withMergeSupport() .withGenesisFile("besu/preMergeGenesis.json") .withJwtTokenAuthorization(JWT_FILE)); } diff --git a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/MergedGenesisAcceptanceTest.java b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/MergedGenesisAcceptanceTest.java index 21b43dbdfc1..b8c9ecd42ed 100644 --- a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/MergedGenesisAcceptanceTest.java +++ b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/MergedGenesisAcceptanceTest.java @@ -41,7 +41,7 @@ void setup() throws Exception { createBesuNode( config -> config - .withMergeSupport(true) + .withMergeSupport() .withGenesisFile("besu/mergedGenesis.json") .withJwtTokenAuthorization(JWT_FILE)); eth1Node.start(); diff --git a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncPostMergeAcceptanceTest.java b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncPostMergeAcceptanceTest.java index c9cd7a53598..0a4eb442dd4 100644 --- a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncPostMergeAcceptanceTest.java +++ b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncPostMergeAcceptanceTest.java @@ -42,7 +42,7 @@ void setup() throws Exception { config -> config .withMiningEnabled(true) - .withMergeSupport(true) + .withMergeSupport() .withP2pEnabled(true) .withGenesisFile("besu/preMergeGenesis.json") .withJwtTokenAuthorization(JWT_FILE)); @@ -51,7 +51,7 @@ void setup() throws Exception { createBesuNode( config -> config - .withMergeSupport(true) + .withMergeSupport() .withP2pEnabled(true) .withGenesisFile("besu/preMergeGenesis.json") .withJwtTokenAuthorization(JWT_FILE)); diff --git a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncSafeSlotsAcceptanceTest.java b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncSafeSlotsAcceptanceTest.java index c2bf7610e92..eb98fc960a4 100644 --- a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncSafeSlotsAcceptanceTest.java +++ b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/OptimisticSyncSafeSlotsAcceptanceTest.java @@ -43,7 +43,7 @@ void setup() throws Exception { config -> config .withMiningEnabled(true) - .withMergeSupport(true) + .withMergeSupport() .withP2pEnabled(true) .withGenesisFile("besu/preMergeGenesis.json") .withJwtTokenAuthorization(JWT_FILE)); @@ -52,7 +52,7 @@ void setup() throws Exception { createBesuNode( config -> config - .withMergeSupport(true) + .withMergeSupport() .withP2pEnabled(true) .withGenesisFile("besu/preMergeGenesis.json") .withJwtTokenAuthorization(JWT_FILE)); diff --git a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/SyncingStatusAcceptanceTest.java b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/SyncingStatusAcceptanceTest.java index 0fb81569e09..730ea9c95be 100644 --- a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/SyncingStatusAcceptanceTest.java +++ b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/SyncingStatusAcceptanceTest.java @@ -35,7 +35,7 @@ void shouldRespondSyncingWhenExecutionLayerIsDown() throws Exception { config -> config .withMiningEnabled(true) - .withMergeSupport(true) + .withMergeSupport() .withGenesisFile("besu/preMergeGenesis.json") .withJwtTokenAuthorization(JWT_FILE)); eth1Node.start(); diff --git a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/WebsocketsMergeTransitionAcceptanceTest.java b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/WebsocketsMergeTransitionAcceptanceTest.java index 586bdc9acf8..0099ede0e15 100644 --- a/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/WebsocketsMergeTransitionAcceptanceTest.java +++ b/acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/WebsocketsMergeTransitionAcceptanceTest.java @@ -40,7 +40,7 @@ void setup() throws Exception { config -> config .withMiningEnabled(true) - .withMergeSupport(true) + .withMergeSupport() .withGenesisFile("besu/preMergeGenesis.json") .withJwtTokenAuthorization(jwtFile)); eth1Node.start(); diff --git a/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/BesuNode.java b/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/BesuNode.java index 31f82f9d05f..3e28f867512 100644 --- a/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/BesuNode.java +++ b/acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/BesuNode.java @@ -243,7 +243,7 @@ public BesuNode.Config withGenesisFile(final String genesisFilePath) { return this; } - public BesuNode.Config withMergeSupport(final boolean enableMergeSupport) { + public BesuNode.Config withMergeSupport() { configMap.put("rpc-http-api", MERGE_RPC_MODULES); configMap.put("rpc-ws-api", MERGE_RPC_MODULES); configMap.put("engine-rpc-port", Integer.toString(ENGINE_JSON_RPC_PORT));