Simplified executionPayloadV1 testing util (#228)

Consensys · Oct 22, 2024 · d2a120f · d2a120f
1 parent 3ab2f91
commit d2a120f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/coordinator/app/build.gradle b/coordinator/app/build.gradle
@@ -4,11 +4,14 @@ plugins {
 
 configurations.configureEach {
   exclude group: "org.rocksdb", module: "rocksdbjni"
-  exclude group: "it.unimi.dsi", module: "fastutil"
   exclude group: "org.hyperledger.besu", module: "bls12-381"
   exclude group: "org.hyperledger.besu", module: "secp256r1"
 }
 
+configurations {
+  runtimeClasspath.exclude group: "it.unimi.dsi", module: "fastutil"
+}
+
 dependencies {
   implementation project(':jvm-libs:generic:json-rpc')
   implementation project(':jvm-libs:generic:http-rest')

diff --git a/...r/src/main/kotlin/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV1.kt b/...r/src/main/kotlin/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV1.kt
@@ -7,7 +7,6 @@ import net.consensys.toBigInteger
 import org.apache.tuweni.bytes.Bytes
 import org.apache.tuweni.bytes.Bytes32
 import org.apache.tuweni.units.bigints.UInt256
-import tech.pegasys.teku.ethereum.executionclient.schema.SharedUtils.dataStructureUtil
 import tech.pegasys.teku.infrastructure.bytes.Bytes20
 import tech.pegasys.teku.infrastructure.unsigned.UInt64
 import tech.pegasys.teku.spec.TestSpecFactory
@@ -86,7 +85,7 @@ fun randomExecutionPayload(
   transactionsRlp: List<Bytes> = emptyList(),
   blockNumber: Long? = null
 ): ExecutionPayloadV1 {
-  val executionPayload = dataStructureUtil().randomExecutionPayload()
+  val executionPayload = dataStructureUtil.randomExecutionPayload()
   return ExecutionPayloadV1(
     /* parentHash = */ executionPayload.parentHash,
     /* feeRecipient = */
@@ -118,17 +117,7 @@ fun randomExecutionPayload(
   )
 }
 
-private object SharedUtils {
-  // Lazy loaded to avoid issues on coordinator tests
-  private var dataStructureUtil: DataStructureUtil? = null
-
-  fun dataStructureUtil(): DataStructureUtil {
-    if (dataStructureUtil == null) {
-      dataStructureUtil = DataStructureUtil(TestSpecFactory.createMinimalBellatrix())
-    }
-    return dataStructureUtil!!
-  }
-}
+val dataStructureUtil: DataStructureUtil = DataStructureUtil(TestSpecFactory.createMinimalBellatrix())
 
 // Teku UInt64 has a bug allow negative number to be created
 // random test payload creates such cases we need to fix it