Improve fork_choice spec test runner's time (#5277)

ChainSafe · Mar 18, 2023 · 794ebdd · 794ebdd
1 parent 7204718
commit 794ebdd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/beacon-node/test/spec/presets/fork_choice.ts b/packages/beacon-node/test/spec/presets/fork_choice.ts
@@ -6,7 +6,7 @@ import {CheckpointWithHex, ForkChoice} from "@lodestar/fork-choice";
 import {phase0, allForks, bellatrix, ssz, RootHex, deneb} from "@lodestar/types";
 import {bnToNum} from "@lodestar/utils";
 import {createBeaconConfig} from "@lodestar/config";
-import {ForkSeq} from "@lodestar/params";
+import {ForkSeq, isForkBlobs} from "@lodestar/params";
 import {BeaconChain, ChainEvent} from "../../../src/chain/index.js";
 import {createCachedBeaconStateTest} from "../../utils/cachedBeaconState.js";
 import {testLogger} from "../../utils/logger.js";
@@ -42,8 +42,10 @@ export const forkChoiceTest = (opts: {onlyPredefinedResponses: boolean}): TestRu
 ) => {
   return {
     testFunction: async (testcase) => {
-      await initCKZG();
-      loadEthereumTrustedSetup();
+      if (isForkBlobs(fork)) {
+        await initCKZG();
+        loadEthereumTrustedSetup();
+      }
 
       const {steps, anchorState} = testcase;
       const currentSlot = anchorState.slot;

diff --git a/packages/params/src/forkName.ts b/packages/params/src/forkName.ts
@@ -32,7 +32,7 @@ export function isForkExecution(fork: ForkName): fork is ForkExecution {
 
 export type ForkWithdrawals = Exclude<ForkExecution, ForkName.bellatrix>;
 export function isForkWithdrawals(fork: ForkName): fork is ForkWithdrawals {
-  return isForkExecution(fork) && fork !== ForkName.capella;
+  return isForkExecution(fork) && fork !== ForkName.bellatrix;
 }
 
 export type ForkBlobs = Exclude<ForkExecution, ForkName.bellatrix | ForkName.capella>;