maru-cluster-support no EL node (#462)

Author: fluentcrafter

jvm-libs/test-utils/src/main/kotlin/maru/test/cluster/MaruCluster.kt

@@ -117,25 +117,28 @@ class MaruCluster(
 
   private fun createNodeBuilder(
     label: String,
+    addBesu: Boolean = false,
     configurator: (NodeBuilder) -> Unit,
   ): NodeBuilder {
     assertUniqueLabel(label)
     return NodeBuilder(
       maruConfigTemplate = maruConfigTemplate,
       clusterDataDir = maruClusterDataDir,
       nodeLabel = label,
+      createDefaultElBesuNode = addBesu,
     ).also(configurator)
   }
 
   @Synchronized
   fun addNode(
     label: String,
+    addBesu: Boolean = false,
     configurator: (NodeBuilder) -> Unit = {},
   ): MaruCluster {
     if (runningState == RunningState.RUNNING || runningState == RunningState.STARTING) {
-      addNewExtraNodeAndStart(label, configurator)
+      addNewExtraNodeAndStart(label, addBesu, configurator)
     } else {
-      nodesBuilders.add(createNodeBuilder(label, configurator))
+      nodesBuilders.add(createNodeBuilder(label, addBesu, configurator))
     }
     return this
   }
@@ -145,14 +148,15 @@ class MaruCluster(
    */
   private fun addNewExtraNodeAndStart(
     nodeLabel: String,
+    addBesu: Boolean = false,
     configurator: (NodeBuilder) -> Unit = {},
   ): MaruCluster {
-    val nodeStatConfigs =
-      createNodeBuilder(nodeLabel, configurator)
+    val nodeStartConfigs =
+      createNodeBuilder(nodeLabel, addBesu, configurator)
         .build(genesisFactory::besuGenesis, besuCluster)
     val node =
       buildClusterNode(
-        nodeStartingConfig = nodeStatConfigs,
+        nodeStartingConfig = nodeStartConfigs,
         bootNodesEnrs = getBootnodesEnrs(),
       )
     nodes += node
@@ -162,9 +166,10 @@ class MaruCluster(
   @Synchronized
   fun addNode(
     role: NodeRole,
+    withBesuEl: Boolean = false,
     configurator: (NodeBuilder) -> Unit = {},
   ): MaruCluster =
-    addNode(label = role.name.lowercase()) { nodeBuilder ->
+    addNode(label = role.name.lowercase(), withBesuEl) { nodeBuilder ->
       nodeBuilder.withRole(role).let(configurator)
     }
 

jvm-libs/test-utils/src/main/kotlin/maru/test/cluster/NodeBuilder.kt

@@ -17,6 +17,7 @@ class NodeBuilder(
   maruConfigTemplate: MaruConfig,
   var nodeLabel: String,
   val clusterDataDir: Path,
+  val createDefaultElBesuNode: Boolean,
 ) {
   class NodeBuildingConfig(
     val nodeRole: NodeRole,
@@ -55,11 +56,16 @@ class NodeBuilder(
         ),
     )
 
-  // fun withBesu(besuBuilder: () -> BesuNode): NodeBuilder {
+  // fun withElBesu(besuBuilder: () -> BesuNode): NodeBuilder {
   //   this.elNodeBuilder = { BesuElNode(besu = besuBuilder(), besuCluster = besuCluster) }
   //   return this
   // }
 
+  fun withElNode(elNodeBuilder: ElNodeBuilder): NodeBuilder {
+    this.elNodeBuilder = elNodeBuilder
+    return this
+  }
+
   fun withRole(nodeRole: NodeRole): NodeBuilder {
     this.nodeRole = nodeRole
     return this
@@ -101,7 +107,7 @@ class NodeBuilder(
     besuGenesisProvider: () -> String,
     besuCluster: BesuCluster,
   ) {
-    if (elNodeBuilder == null) {
+    if (elNodeBuilder == null && createDefaultElBesuNode) {
       this.elNodeBuilder = {
         BesuElNode(
           BesuFactory.buildTestBesu(
@@ -123,6 +129,9 @@ class NodeBuilder(
     if (!this::nodeRole.isInitialized) {
       nodeRole = getNodeRoleFromLabel(this.nodeLabel)
     }
+    require(!(nodeRole.isSequencer() && elNodeBuilder == null)) {
+      "Node with $nodeRole role needs an EL node builder defined"
+    }
 
     return NodeBuildingConfig(
       maruConfig = this.maruConfig,

jvm-libs/test-utils/src/test/kotlin/maru/test/MaruClusterTest.kt

@@ -28,15 +28,9 @@ import org.assertj.core.api.Assertions.assertThat
 import org.awaitility.Awaitility.await
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.MethodOrderer
 import org.junit.jupiter.api.Order
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.TestMethodOrder
-import org.junit.jupiter.api.parallel.Execution
-import org.junit.jupiter.api.parallel.ExecutionMode
 
-@TestMethodOrder(MethodOrderer.OrderAnnotation::class)
-@Execution(ExecutionMode.SAME_THREAD)
 class MaruClusterTest {
   private lateinit var cluster: MaruCluster
 
@@ -60,12 +54,11 @@ class MaruClusterTest {
   }
 
   @Test
-  @Order(1)
   fun `should allow to retrieve nodes by label`() {
     cluster =
       MaruCluster()
         .addNode(NodeRole.Follower)
-        .addNode(NodeRole.Sequencer)
+        .addNode(NodeRole.Sequencer, withBesuEl = true)
         .addNode("follower-special")
         .start()
 
@@ -88,7 +81,7 @@ class MaruClusterTest {
                 ElFork.Prague,
               ),
           ),
-      ).addNode(NodeRole.Sequencer) { nodeBuilder ->
+      ).addNode(NodeRole.Sequencer, withBesuEl = true) { nodeBuilder ->
         nodeBuilder.withLabel("sequencer")
       }.start()
 
@@ -132,7 +125,7 @@ class MaruClusterTest {
                 ElFork.Prague,
               ),
           ),
-      ).addNode("sequencer")
+      ).addNode("sequencer", addBesu = true)
         .start()
 
     await()
@@ -153,7 +146,7 @@ class MaruClusterTest {
   fun `should instantiate multiple nodes in the cluster with static peering and sync`() {
     cluster =
       MaruCluster()
-        .addNode("sequencer")
+        .addNode("sequencer", addBesu = true)
         .addNode("follower-internal-0") { nodeBuilder ->
           nodeBuilder
             .staticPeers(listOf("sequencer"))
@@ -163,10 +156,11 @@ class MaruClusterTest {
         }.start()
 
     await()
+      .apply { }
       .pollInterval(1.seconds.toJavaDuration())
       .atMost(120.seconds.toJavaDuration())
       .untilAsserted {
-        cluster.assertNodesAreSyncedUpTo(targetBlockNumber = 5UL)
+        cluster.assertNodesAreSyncedUpTo(targetBlockNumber = 3UL)
       }
   }
 
@@ -176,7 +170,7 @@ class MaruClusterTest {
     cluster =
       MaruCluster()
         .addNode("bootnode-1")
-        .addNode("sequencer")
+        .addNode("sequencer", addBesu = true)
         .addNode("follower-internal-0")
         .start()
     val followers = cluster.nodes(NodeRole.Follower)
@@ -203,7 +197,7 @@ class MaruClusterTest {
     cluster =
       MaruCluster()
         .addNode("bootnode-0")
-        .addNode("sequencer")
+        .addNode("sequencer", addBesu = true)
         .addNode("follower-internal-0")
         .start()