try to speed build

StefanBratanov · Oct 27, 2023 · 9f00f41 · 9f00f41
1 parent 3556ba9
commit 9f00f41
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/...m/spec/src/main/java/tech/pegasys/teku/spec/executionlayer/ExecutionLayerChannelStub.java b/...m/spec/src/main/java/tech/pegasys/teku/spec/executionlayer/ExecutionLayerChannelStub.java
@@ -108,7 +108,13 @@ public ExecutionLayerChannelStub(
     this.transitionEmulationEnabled = enableTransitionEmulation;
     this.terminalBlockHashInTTDMode =
         terminalBlockHashInTTDMode.orElse(Bytes32.fromHexStringLenient("0x01"));
-    this.blobsUtil = new BlobsUtil(spec, KZG.INSTANCE);
+    final KZG kzg;
+    if (spec.isMilestoneSupported(SpecMilestone.DENEB)) {
+      kzg = KZG.getInstance();
+    } else {
+      kzg = KZG.NOOP;
+    }
+    this.blobsUtil = new BlobsUtil(spec, kzg);
   }
 
   public ExecutionLayerChannelStub(

diff --git a/...c/property-test/java/tech/pegasys/teku/spec/logic/versions/deneb/helpers/KzgResolver.java b/...c/property-test/java/tech/pegasys/teku/spec/logic/versions/deneb/helpers/KzgResolver.java
@@ -51,7 +51,7 @@ private KZG getKzgWithTrustedSetup() {
 
   private static class KzgAutoLoadFree implements Store.CloseOnReset {
 
-    private final KZG kzg = KZG.INSTANCE;
+    private final KZG kzg = KZG.getInstance();
 
     private KzgAutoLoadFree() {
       TrustedSetupLoader.loadTrustedSetupForTests(kzg);

diff --git a/ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/generator/ChainBuilder.java b/ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/generator/ChainBuilder.java
@@ -44,7 +44,6 @@
 import tech.pegasys.teku.kzg.KZG;
 import tech.pegasys.teku.kzg.KZGCommitment;
 import tech.pegasys.teku.kzg.KZGProof;
-import tech.pegasys.teku.kzg.trusted_setups.TrustedSetupLoader;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.SpecMilestone;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.Blob;
@@ -108,14 +107,7 @@ private ChainBuilder(
       final Optional<UInt64> maybeEarliestBlobSidecarSlot) {
     this.spec = spec;
     this.validatorKeys = validatorKeys;
-    final KZG kzg;
-    if (spec.isMilestoneSupported(SpecMilestone.DENEB)) {
-      kzg = KZG.INSTANCE;
-      TrustedSetupLoader.loadTrustedSetupForTests(kzg);
-    } else {
-      kzg = KZG.NOOP;
-    }
-    blobsUtil = new BlobsUtil(spec, kzg);
+    blobsUtil = new BlobsUtil(spec, KZG.NOOP);
     attestationGenerator = new AttestationGenerator(spec, validatorKeys);
     attesterSlashingGenerator = new AttesterSlashingGenerator(spec, validatorKeys);
     blockProposalTestUtil = new BlockProposalTestUtil(spec);

diff --git a/infrastructure/kzg/src/main/java/tech/pegasys/teku/kzg/KZG.java b/infrastructure/kzg/src/main/java/tech/pegasys/teku/kzg/KZG.java
@@ -22,7 +22,9 @@
  */
 public interface KZG {
 
-  KZG INSTANCE = CKZG4844.getInstance();
+  static KZG getInstance() {
+    return CKZG4844.getInstance();
+  }
 
   KZG NOOP =
       new KZG() {

diff --git a/...aconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java b/...aconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java
@@ -473,7 +473,7 @@ protected void initExecutionLayer() {
 
   protected void initKzg() {
     if (spec.isMilestoneSupported(SpecMilestone.DENEB)) {
-      kzg = KZG.INSTANCE;
+      kzg = KZG.getInstance();
       final String trustedSetupFile =
           beaconConfig
               .eth2NetworkConfig()