lint and tsc

ChainSafe · Apr 22, 2024 · 4bd7189 · 4bd7189
1 parent 2111e33
commit 4bd7189
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 9 deletions.
diff --git a/packages/beacon-node/src/chain/seenCache/seenGossipBlockInput.ts b/packages/beacon-node/src/chain/seenCache/seenGossipBlockInput.ts
@@ -2,7 +2,7 @@ import {toHexString} from "@chainsafe/ssz";
 import {deneb, RootHex, ssz, allForks} from "@lodestar/types";
 import {ChainForkConfig} from "@lodestar/config";
 import {pruneSetToMax} from "@lodestar/utils";
-import {BLOBSIDECAR_FIXED_SIZE, ForkSeq, isForkBlobs, ForkName} from "@lodestar/params";
+import {BLOBSIDECAR_FIXED_SIZE, isForkBlobs, ForkName} from "@lodestar/params";
 
 import {
   BlockInput,
@@ -137,7 +137,7 @@ export class SeenGossipBlockInput {
       if (blobKzgCommitments.length === blobsCache.size) {
         const allBlobs = getBlockInputBlobs(blobsCache, BlobsSource.gossip);
         metrics?.syncUnknownBlock.resolveAvailabilitySource.inc({source: BlockInputAvailabilitySource.GOSSIP});
-        const {blobs, blobsBytes, blobsSource} = allBlobs;
+        const {blobs} = allBlobs;
         const blockData = {fork: cachedData.fork, ...allBlobs} as BlockInputDataBlobs;
         const blockInput = getBlockInput.availableData(
           config,

diff --git a/packages/beacon-node/src/network/reqresp/beaconBlocksMaybeBlobsByRoot.ts b/packages/beacon-node/src/network/reqresp/beaconBlocksMaybeBlobsByRoot.ts
@@ -103,7 +103,7 @@ export async function unavailableBeaconBlobsByRoot(
   // check and see if all blobs are now available and in that case resolve availability
   // if not this will error and the leftover blobs will be tried from another peer
   const allBlobs = getBlockInputBlobs(blobsCache, BlobsSource.byRoot);
-  const {blobs, blobsBytes, blobsSource} = allBlobs;
+  const {blobs} = allBlobs;
   if (blobs.length !== blobKzgCommitmentsLen) {
     throw Error(`Not all blobs fetched missingBlobs=${blobKzgCommitmentsLen - blobs.length}`);
   }

diff --git a/packages/beacon-node/test/e2e/network/onWorker/dataSerialization.test.ts b/packages/beacon-node/test/e2e/network/onWorker/dataSerialization.test.ts
@@ -18,9 +18,9 @@ import {
 import {
   BlockInputType,
   BlockSource,
-  BlockInputBlobs,
   BlockInput,
   BlockInputDataBlobs,
+  CachedData,
 } from "../../../../src/chain/blocks/types.js";
 import {ZERO_HASH, ZERO_HASH_HEX} from "../../../../src/constants/constants.js";
 import {IteratorEventType} from "../../../../src/util/asyncIterableToEvents.js";
@@ -261,7 +261,7 @@ function getEmptyBlockInput(): BlockInput {
   }
   const blobsCache = new Map();
 
-  const cachedData = {fork: ForkName.deneb, blobsCache, availabilityPromise, resolveAvailability};
+  const cachedData = {fork: ForkName.deneb, blobsCache, availabilityPromise, resolveAvailability} as CachedData;
   return {
     type: BlockInputType.dataPromise,
     block: ssz.deneb.SignedBeaconBlock.defaultValue(),

diff --git a/packages/fork-choice/test/perf/forkChoice/util.ts b/packages/fork-choice/test/perf/forkChoice/util.ts
@@ -1,6 +1,13 @@
 import {fromHexString} from "@chainsafe/ssz";
 import {config} from "@lodestar/config/default";
-import {ExecutionStatus, ForkChoice, IForkChoiceStore, ProtoBlock, ProtoArray} from "../../../src/index.js";
+import {
+  ExecutionStatus,
+  ForkChoice,
+  IForkChoiceStore,
+  ProtoBlock,
+  ProtoArray,
+  DataAvailabilityStatus,
+} from "../../../src/index.js";
 import {computeTotalBalance} from "../../../src/forkChoice/store.js";
 
 const genesisSlot = 0;
@@ -29,6 +36,7 @@ export function initializeForkChoice(opts: Opts): ForkChoice {
 
       executionPayloadBlockHash: null,
       executionStatus: ExecutionStatus.PreMerge,
+      dataAvailabilityStatus: DataAvailabilityStatus.PreData,
     } as Omit<ProtoBlock, "targetRoot">,
     genesisSlot
   );
@@ -77,6 +85,7 @@ export function initializeForkChoice(opts: Opts): ForkChoice {
       executionStatus: ExecutionStatus.PreMerge,
 
       timeliness: false,
+      dataAvailabilityStatus: DataAvailabilityStatus.PreData,
     };
 
     protoArr.onBlock(block, block.slot);

diff --git a/packages/fork-choice/test/unit/forkChoice/forkChoice.test.ts b/packages/fork-choice/test/unit/forkChoice/forkChoice.test.ts
@@ -12,6 +12,7 @@ import {
   ProtoArray,
   ExecutionStatus,
   EpochDifference,
+  DataAvailabilityStatus,
 } from "../../../src/index.js";
 
 const rootStateBytePrefix = 0xaa;
@@ -41,6 +42,7 @@ describe("Forkchoice", function () {
 
         executionPayloadBlockHash: null,
         executionStatus: ExecutionStatus.PreMerge,
+        dataAvailabilityStatus: DataAvailabilityStatus.PreData,
       } as Omit<ProtoBlock, "targetRoot">,
       genesisSlot
     );
@@ -103,6 +105,7 @@ describe("Forkchoice", function () {
       executionStatus: ExecutionStatus.PreMerge,
 
       timeliness: false,
+      dataAvailabilityStatus: DataAvailabilityStatus.PreData,
     };
   };
 

diff --git a/packages/fork-choice/test/unit/forkChoice/getProposerHead.test.ts b/packages/fork-choice/test/unit/forkChoice/getProposerHead.test.ts
@@ -4,7 +4,14 @@ import {config} from "@lodestar/config/default";
 import {Slot} from "@lodestar/types";
 import {toHex} from "@lodestar/utils";
 import {INTERVALS_PER_SLOT, SLOTS_PER_EPOCH} from "@lodestar/params";
-import {ForkChoice, IForkChoiceStore, ProtoArray, ExecutionStatus, ProtoBlock} from "../../../src/index.js";
+import {
+  ForkChoice,
+  IForkChoiceStore,
+  ProtoArray,
+  ExecutionStatus,
+  ProtoBlock,
+  DataAvailabilityStatus,
+} from "../../../src/index.js";
 import {NotReorgedReason} from "../../../src/forkChoice/interface.js";
 import {getBlockRoot, getStateRoot} from "./forkChoice.test.js";
 
@@ -39,6 +46,7 @@ describe("Forkchoice / GetProposerHead", function () {
     executionStatus: ExecutionStatus.PreMerge,
 
     timeliness: false,
+    dataAvailabilityStatus: DataAvailabilityStatus.PreData,
   };
 
   const baseHeadBlock: ProtoBlockWithWeight = {
@@ -63,6 +71,7 @@ describe("Forkchoice / GetProposerHead", function () {
     timeliness: false,
 
     weight: 29,
+    dataAvailabilityStatus: DataAvailabilityStatus.PreData,
   };
 
   const baseParentHeadBlock: ProtoBlockWithWeight = {
@@ -86,6 +95,7 @@ describe("Forkchoice / GetProposerHead", function () {
 
     timeliness: false,
     weight: 212, // 240 - 29 + 1
+    dataAvailabilityStatus: DataAvailabilityStatus.PreData,
   };
 
   const fcStore: IForkChoiceStore = {

diff --git a/packages/fork-choice/test/unit/protoArray/getCommonAncestor.test.ts b/packages/fork-choice/test/unit/protoArray/getCommonAncestor.test.ts
@@ -1,5 +1,5 @@
 import {describe, it, expect} from "vitest";
-import {ProtoArray, ExecutionStatus} from "../../../src/index.js";
+import {ProtoArray, ExecutionStatus, DataAvailabilityStatus} from "../../../src/index.js";
 
 describe("getCommonAncestor", () => {
   const blocks: {slot: number; root: string; parent: string}[] = [
@@ -43,6 +43,7 @@ describe("getCommonAncestor", () => {
       timeliness: false,
 
       ...{executionPayloadBlockHash: null, executionStatus: ExecutionStatus.PreMerge},
+      dataAvailabilityStatus: DataAvailabilityStatus.PreData,
     },
     0
   );
@@ -68,6 +69,7 @@ describe("getCommonAncestor", () => {
         timeliness: false,
 
         ...{executionPayloadBlockHash: null, executionStatus: ExecutionStatus.PreMerge},
+        dataAvailabilityStatus: DataAvailabilityStatus.PreData,
       },
       block.slot
     );

diff --git a/packages/fork-choice/test/unit/protoArray/protoArray.test.ts b/packages/fork-choice/test/unit/protoArray/protoArray.test.ts
@@ -1,7 +1,7 @@
 import {describe, it, expect} from "vitest";
 import {RootHex} from "@lodestar/types";
 
-import {ProtoArray, ExecutionStatus} from "../../../src/index.js";
+import {ProtoArray, ExecutionStatus, DataAvailabilityStatus} from "../../../src/index.js";
 
 describe("ProtoArray", () => {
   it("finalized descendant", () => {
@@ -33,6 +33,7 @@ describe("ProtoArray", () => {
         timeliness: false,
 
         ...{executionPayloadBlockHash: null, executionStatus: ExecutionStatus.PreMerge},
+        dataAvailabilityStatus: DataAvailabilityStatus.PreData,
       },
       genesisSlot
     );
@@ -58,6 +59,7 @@ describe("ProtoArray", () => {
         timeliness: false,
 
         ...{executionPayloadBlockHash: null, executionStatus: ExecutionStatus.PreMerge},
+        dataAvailabilityStatus: DataAvailabilityStatus.PreData,
       },
       genesisSlot + 1
     );
@@ -83,6 +85,7 @@ describe("ProtoArray", () => {
         timeliness: false,
 
         ...{executionPayloadBlockHash: null, executionStatus: ExecutionStatus.PreMerge},
+        dataAvailabilityStatus: DataAvailabilityStatus.PreData,
       },
       genesisSlot + 1
     );