chore: fix CI failure due to recent merge from unstable (#6646)

ChainSafe · Jun 25, 2024 · 7cb27fa · 7cb27fa
1 parent 3d2b69b
commit 7cb27fa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/packages/beacon-node/src/execution/engine/http.ts b/packages/beacon-node/src/execution/engine/http.ts
@@ -179,10 +179,10 @@ export class ExecutionEngineHttp implements IExecutionEngine {
       ForkSeq[fork] >= ForkSeq.electra
         ? "engine_newPayloadV6110"
         : ForkSeq[fork] >= ForkSeq.deneb
-        ? "engine_newPayloadV3"
-        : ForkSeq[fork] >= ForkSeq.capella
-          ? "engine_newPayloadV2"
-          : "engine_newPayloadV1";
+          ? "engine_newPayloadV3"
+          : ForkSeq[fork] >= ForkSeq.capella
+            ? "engine_newPayloadV2"
+            : "engine_newPayloadV1";
 
     const serializedExecutionPayload = serializeExecutionPayload(fork, executionPayload);
 
@@ -375,10 +375,10 @@ export class ExecutionEngineHttp implements IExecutionEngine {
       ForkSeq[fork] >= ForkSeq.electra
         ? "engine_getPayloadV6110"
         : ForkSeq[fork] >= ForkSeq.deneb
-        ? "engine_getPayloadV3"
-        : ForkSeq[fork] >= ForkSeq.capella
-          ? "engine_getPayloadV2"
-          : "engine_getPayloadV1";
+          ? "engine_getPayloadV3"
+          : ForkSeq[fork] >= ForkSeq.capella
+            ? "engine_getPayloadV2"
+            : "engine_getPayloadV1";
     const payloadResponse = await this.rpc.fetchWithRetries<
       EngineApiRpcReturnTypes[typeof method],
       EngineApiRpcParamTypes[typeof method]

diff --git a/packages/beacon-node/test/perf/chain/stateCache/updateUnfinalizedPubkeys.test.ts b/packages/beacon-node/test/perf/chain/stateCache/updateUnfinalizedPubkeys.test.ts
@@ -7,7 +7,7 @@ import bls from "@chainsafe/bls";
 import {ssz} from "@lodestar/types";
 import {type CachedBeaconStateAllForks, PubkeyIndexMap} from "@lodestar/state-transition";
 import {bytesToBigInt, intToBytes} from "@lodestar/utils";
-import {CheckpointStateCache, StateContextCache} from "../../../../src/chain/stateCache/index.js";
+import {InMemoryCheckpointStateCache, StateContextCache} from "../../../../src/chain/stateCache/index.js";
 import {generateCachedElectraState} from "../../../utils/state.js";
 
 // Benchmark date from Mon Nov 21 2023 - Intel Core i7-9750H @ 2.60Ghz
@@ -21,7 +21,7 @@ describe("updateUnfinalizedPubkeys perf tests", function () {
   const numCheckpointStateCache = 8;
   const numStateCache = 3 * 32;
 
-  let checkpointStateCache: CheckpointStateCache;
+  let checkpointStateCache: InMemoryCheckpointStateCache;
   let stateCache: StateContextCache;
 
   const unfinalizedPubkey2Index = generatePubkey2Index(0, Math.max.apply(null, numPubkeysToBeFinalizedCases));
@@ -35,7 +35,7 @@ describe("updateUnfinalizedPubkeys perf tests", function () {
         baseState.epochCtx.pubkey2index = new PubkeyIndexMap();
         baseState.epochCtx.index2pubkey = [];
 
-        checkpointStateCache = new CheckpointStateCache({});
+        checkpointStateCache = new InMemoryCheckpointStateCache({});
         stateCache = new StateContextCache({});
 
         for (let i = 0; i < numCheckpointStateCache; i++) {

diff --git a/packages/beacon-node/test/sim/electra-interop.test.ts b/packages/beacon-node/test/sim/electra-interop.test.ts
@@ -1,7 +1,7 @@
 import fs from "node:fs";
+import assert from "node:assert";
 import {describe, it, vi, afterAll, afterEach} from "vitest";
-/* eslint-disable @typescript-eslint/naming-convention */
-import _ from "lodash";
+
 import {LogLevel, sleep} from "@lodestar/utils";
 import {ForkName, SLOTS_PER_EPOCH, UNSET_DEPOSIT_RECEIPTS_START_INDEX} from "@lodestar/params";
 import {electra, Epoch, Slot} from "@lodestar/types";
@@ -225,13 +225,13 @@ describe("executionEngine / ExecutionEngineHttp", function () {
     }
 
     const actualDepositReceipt = payload.depositReceipts[0];
-    if (!_.isEqual(actualDepositReceipt, depositReceiptB)) {
-      throw Error(
-        `Deposit receipts mismatched. Expected: ${JSON.stringify(depositReceiptB)}, actual: ${JSON.stringify(
-          actualDepositReceipt
-        )}`
-      );
-    }
+    assert.deepStrictEqual(
+      actualDepositReceipt,
+      depositReceiptB,
+      `Deposit receipts mismatched. Expected: ${JSON.stringify(depositReceiptB)}, actual: ${JSON.stringify(
+        actualDepositReceipt
+      )}`
+    );
   });
 
   it("Post-merge, run for a few blocks", async function () {

diff --git a/packages/beacon-node/test/spec/utils/specTestIterator.ts b/packages/beacon-node/test/spec/utils/specTestIterator.ts
@@ -57,6 +57,7 @@ const coveredTestRunners = [
 // ],
 // ```
 export const defaultSkipOpts: SkipOpts = {
+  skippedForks: ["eip6110"],
   // TODO: capella
   // BeaconBlockBody proof in lightclient is the new addition in v1.3.0-rc.2-hotfix
   // Skip them for now to enable subsequently

diff --git a/packages/state-transition/src/cache/epochCache.ts b/packages/state-transition/src/cache/epochCache.ts
@@ -226,7 +226,7 @@ export class EpochCache {
    * eg. latest epoch = 105, latest finalized cp state epoch = 102
    * then the list will be (in terms of epoch) [103, 104, 105]
    */
-  private historicalValidatorLengths: immutable.List<number>;
+  historicalValidatorLengths: immutable.List<number>;
 
   constructor(data: {
     config: BeaconConfig;