Running post-bellatrix merged network ATs with develop Besu docker (#…

…8550)
Consensys · Aug 29, 2024 · 6c3e1f5 · 6c3e1f5
1 parent e862210
commit 6c3e1f5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/.../acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java b/.../acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java
@@ -16,7 +16,6 @@
 import com.google.common.io.Resources;
 import java.net.URL;
 import java.util.Map;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.infrastructure.time.SystemTimeProvider;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
@@ -33,7 +32,6 @@ public class CapellaUpgradeAcceptanceTest extends AcceptanceTestBase {
   private static final URL JWT_FILE = Resources.getResource("auth/ee-jwt-secret.hex");
 
   @Test
-  @Disabled("Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)")
   void shouldUpgradeToCapella() throws Exception {
     final UInt64 currentTime = timeProvider.getTimeInSeconds();
     final int genesisTime = currentTime.plus(30).intValue(); // magic node startup time
@@ -43,7 +41,8 @@ void shouldUpgradeToCapella() throws Exception {
 
     BesuNode primaryEL =
         createBesuNode(
-            BesuDockerVersion.STABLE,
+            // "Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)"
+            BesuDockerVersion.DEVELOP,
             config ->
                 config
                     .withMergeSupport()
@@ -55,7 +54,8 @@ void shouldUpgradeToCapella() throws Exception {
 
     BesuNode secondaryEL =
         createBesuNode(
-            BesuDockerVersion.STABLE,
+            // "Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)"
+            BesuDockerVersion.DEVELOP,
             config ->
                 config
                     .withMergeSupport()

diff --git a/...rc/acceptance-test/java/tech/pegasys/teku/test/acceptance/DenebUpgradeAcceptanceTest.java b/...rc/acceptance-test/java/tech/pegasys/teku/test/acceptance/DenebUpgradeAcceptanceTest.java
@@ -16,7 +16,6 @@
 import com.google.common.io.Resources;
 import java.net.URL;
 import java.util.Map;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.infrastructure.time.SystemTimeProvider;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
@@ -33,7 +32,6 @@ public class DenebUpgradeAcceptanceTest extends AcceptanceTestBase {
   private static final URL JWT_FILE = Resources.getResource("auth/ee-jwt-secret.hex");
 
   @Test
-  @Disabled("Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)")
   void shouldUpgradeToDeneb() throws Exception {
     final UInt64 currentTime = timeProvider.getTimeInSeconds();
     final int genesisTime = currentTime.plus(30).intValue(); // magic node startup time
@@ -48,7 +46,8 @@ void shouldUpgradeToDeneb() throws Exception {
 
     BesuNode primaryEL =
         createBesuNode(
-            BesuDockerVersion.STABLE,
+            // "Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)"
+            BesuDockerVersion.DEVELOP,
             config ->
                 config
                     .withMergeSupport()
@@ -60,7 +59,8 @@ void shouldUpgradeToDeneb() throws Exception {
 
     BesuNode secondaryEL =
         createBesuNode(
-            BesuDockerVersion.STABLE,
+            // "Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)"
+            BesuDockerVersion.DEVELOP,
             config ->
                 config
                     .withMergeSupport()

diff --git a/.../acceptance-test/java/tech/pegasys/teku/test/acceptance/ElectraUpgradeAcceptanceTest.java b/.../acceptance-test/java/tech/pegasys/teku/test/acceptance/ElectraUpgradeAcceptanceTest.java
@@ -16,7 +16,6 @@
 import com.google.common.io.Resources;
 import java.net.URL;
 import java.util.Map;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.ethereum.execution.types.Eth1Address;
 import tech.pegasys.teku.infrastructure.time.SystemTimeProvider;
@@ -39,7 +38,6 @@ public class ElectraUpgradeAcceptanceTest extends AcceptanceTestBase {
   private static final URL JWT_FILE = Resources.getResource("auth/ee-jwt-secret.hex");
 
   @Test
-  @Disabled("Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)")
   void upgradeFromDeneb() throws Exception {
     final UInt64 currentTime = new SystemTimeProvider().getTimeInSeconds();
     final int genesisTime =
@@ -80,7 +78,8 @@ private BesuNode createBesuNode(final int genesisTime) {
     final Map<String, String> genesisOverrides = Map.of("pragueTime", String.valueOf(pragueTime));
 
     return createBesuNode(
-        BesuDockerVersion.STABLE,
+        // "Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)"
+        BesuDockerVersion.DEVELOP,
         config ->
             config
                 .withMergeSupport()

diff --git a/...est/java/tech/pegasys/teku/test/acceptance/ExecutionLayerTriggeredExitAcceptanceTest.java b/...est/java/tech/pegasys/teku/test/acceptance/ExecutionLayerTriggeredExitAcceptanceTest.java
@@ -16,7 +16,6 @@
 import com.google.common.io.Resources;
 import java.net.URL;
 import java.util.Map;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.bls.BLSPublicKey;
 import tech.pegasys.teku.ethereum.execution.types.Eth1Address;
@@ -38,7 +37,6 @@ public class ExecutionLayerTriggeredExitAcceptanceTest extends AcceptanceTestBas
   private static final URL JWT_FILE = Resources.getResource("auth/ee-jwt-secret.hex");
 
   @Test
-  @Disabled("Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)")
   void triggerValidatorExitWithFullWithdrawal() throws Exception {
     final UInt64 currentTime = new SystemTimeProvider().getTimeInSeconds();
     final int genesisTime =
@@ -91,7 +89,8 @@ private BesuNode createBesuNode(final int genesisTime) {
     final Map<String, String> genesisOverrides = Map.of("pragueTime", String.valueOf(genesisTime));
 
     return createBesuNode(
-        BesuDockerVersion.STABLE,
+        // "Waiting for Besu 24.9.0 release (https://github.com/Consensys/teku/issues/8535)"
+        BesuDockerVersion.DEVELOP,
         config ->
             config
                 .withMergeSupport()

diff --git a/...-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/BesuDockerVersion.java b/...-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/BesuDockerVersion.java
@@ -14,7 +14,8 @@
 package tech.pegasys.teku.test.acceptance.dsl;
 
 public enum BesuDockerVersion {
-  STABLE("24.8.0");
+  STABLE("24.8.0"),
+  DEVELOP("develop");
 
   private final String version;