fix: init binding in test files

Author: twoeths

bun/src/binding.ts

@@ -124,7 +124,7 @@ const fns = {
   },
 };
 
-let binding : ConvertFns<typeof fns> = null;
+let binding : ConvertFns<typeof fns> | null = null;
 
 // Load the compiled Zig shared library
 const libPromise = await openLibrary(import.meta.dirname, fns);

bun/src/committeeIndices.ts

@@ -1,8 +1,8 @@
-import { binding } from "./binding.js";
+import { getBinding } from "./binding.js";
 import { validateShufflingParams } from "./shuffle.js";
 
 // this is to sync the constant from zig to Bun which is 0xffffffff
-const ERROR_INDEX = binding.getErrorIndex();
+const ERROR_INDEX = 0xffffffff;
 
 /** Pre-electra, byte count for random value is 1, post-electra, byte count for random value is 2 */
 export declare enum ByteCount {
@@ -20,6 +20,7 @@ export function computeProposerIndex(
 	rounds: number,
 ): number {
 	validateShufflingParams(activeIndices, seed, rounds);
+  const binding = getBinding();
 
 	const result = binding.computeProposerIndex(
 		seed,
@@ -48,6 +49,7 @@ export function computeProposerIndexElectra(
 	rounds: number,
 ): number {
 	validateShufflingParams(activeIndices, seed, rounds);
+  const binding = getBinding();
 
 	const result = binding.computeProposerIndexElectra(
 		seed,
@@ -77,6 +79,7 @@ export function computeSyncCommitteeIndices(
 	rounds: number,
 ): Uint32Array {
 	validateShufflingParams(activeIndices, seed, rounds);
+  const binding = getBinding();
 
 	const out = new Uint32Array(syncCommitteeSize);
 	const result = binding.computeSyncCommitteeIndices(
@@ -111,6 +114,7 @@ export function computeSyncCommitteeIndicesElectra(
 	rounds: number,
 ): Uint32Array {
 	validateShufflingParams(activeIndices, seed, rounds);
+  const binding = getBinding();
 
 	const out = new Uint32Array(syncCommitteeSize);
 	const result = binding.computeSyncCommitteeIndicesElectra(

bun/src/index.ts

@@ -1,3 +1,4 @@
 export * from "./pubkeyIndexMap.js";
 export * from "./shuffle.js";
 export * from "./committeeIndices.js";
+export * from "./binding.js";

bun/src/pubkeyIndexMap.ts

@@ -1,9 +1,10 @@
-import { binding } from "./binding.js";
+import { getBinding } from "./binding.js";
 
 // this is to sync the constant from zig to Bun which is 0xffffffff
-const NOT_FOUND_INDEX = binding.getNotFoundIndex();
+const NOT_FOUND_INDEX = 0xffffffff;
 
 const registry = new FinalizationRegistry((ptr) => {
+  const binding = getBinding();
 	binding.destroyPubkeyIndexMap(ptr);
 });
 
@@ -16,6 +17,7 @@ export class PubkeyIndexMap {
 	// see https://bun.sh/docs/api/ffi#pointers
 	private native_ptr: number;
 	constructor() {
+    const binding = getBinding();
 		const pointer = binding.createPubkeyIndexMap();
 		if (pointer == null) {
 			throw new Error("Failed to create PubkeyIndexMap");
@@ -25,6 +27,7 @@ export class PubkeyIndexMap {
 	}
 
 	get(key: Uint8Array): number | null {
+    const binding = getBinding();
 		const index = binding.pubkeyIndexMapGet(this.native_ptr, key, key.length);
 		if (index === NOT_FOUND_INDEX) {
 			return null;
@@ -33,6 +36,7 @@ export class PubkeyIndexMap {
 	}
 
 	set(key: Uint8Array, value: number): void {
+    const binding = getBinding();
 		const res = binding.pubkeyIndexMapSet(
 			this.native_ptr,
 			key,
@@ -45,18 +49,22 @@ export class PubkeyIndexMap {
 	}
 
 	has(key: Uint8Array): boolean {
+    const binding = getBinding();
 		return binding.pubkeyIndexMapHas(this.native_ptr, key, key.length);
 	}
 
 	size(): number {
+    const binding = getBinding();
 		return binding.pubkeyIndexMapSize(this.native_ptr);
 	}
 
 	delete(key: Uint8Array): boolean {
+    const binding = getBinding();
 		return binding.pubkeyIndexMapDelete(this.native_ptr, key, key.length);
 	}
 
 	clear(): void {
+    const binding = getBinding();
 		binding.pubkeyIndexMapClear(this.native_ptr);
 	}
 }

bun/src/shuffle.ts

@@ -1,6 +1,5 @@
 import { getBinding } from "./binding.js";
 
-const binding = getBinding();
 /**
  * shuffle a list of indices in place
  * activeIndices is modified, we return it for convenience and make it the same to @chainsafe/swap-or-not-shuffle
@@ -12,6 +11,7 @@ export function shuffleList(
 ): Uint32Array {
 	validateShufflingParams(activeIndices, seed, rounds);
 
+  const binding = getBinding();
 	const clonedActiveIndices = activeIndices.slice();
 	const result = binding.shuffleList(
 		clonedActiveIndices,
@@ -38,6 +38,7 @@ export function unshuffleList(
 	rounds: number,
 ): Uint32Array {
 	validateShufflingParams(activeIndices, seed, rounds);
+  const binding = getBinding();
 
 	const clonedActiveIndices = activeIndices.slice();
 	const result = binding.unshuffleList(
@@ -76,6 +77,7 @@ export function withPollingParams(
 	if (timeToWaitMs < 0 || pollEveryMs <= 0 || timeoutMs <= 0) {
 		throw new Error("Invalid parameter");
 	}
+  const binding = getBinding();
 
 	async function doShuffleList(
 		activeIndices: Uint32Array,

bun/test/unit/committeeIndices.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "bun:test";
+import { describe, expect, it, beforeAll } from "bun:test";
 import { randomBytes } from "node:crypto";
 import {
 	EFFECTIVE_BALANCE_INCREMENT,
@@ -12,10 +12,15 @@ import { computeProposerIndex } from "@lodestar/state-transition";
 import {
 	computeProposerIndexElectra,
 	computeSyncCommitteeIndicesElectra,
+  initBinding,
 } from "../../src/index.js";
 import { naiveComputeSyncCommitteeIndicesElectra } from "../referenceImplementation.js";
 
 describe("computeProposerIndex", () => {
+  beforeAll(async () => {
+    await initBinding();
+  });
+
 	it("should compute the same index as reference implementation", async () => {
 		const seed = randomBytes(32);
 		const vc = 1000;

bun/test/unit/pubkeyIndexMap.test.ts

@@ -1,7 +1,11 @@
-import { describe, expect, it } from "bun:test";
-import { PubkeyIndexMap } from "../../src/pubkeyIndexMap.js";
+import { describe, expect, it, beforeAll } from "bun:test";
+import { PubkeyIndexMap, initBinding } from "../../src/index.js";
 
 describe("PubkeyIndexMap", () => {
+  beforeAll(async () => {
+    await initBinding();
+  });
+
 	it("should init/populate/get/set/remove/clear", () => {
 		const map = new PubkeyIndexMap();
 		expect(map.size()).toBe(0);

bun/test/unit/shuffle.test.ts

@@ -1,12 +1,12 @@
-import { describe, expect, it, before } from "bun:test";
+import { describe, expect, it, beforeAll } from "bun:test";
 import { randomBytes } from "node:crypto";
 import {
 	shuffleList,
 	unshuffleList,
 	withPollingParams,
-} from "../../src/shuffle.js";
+  initBinding,
+} from "../../src/index.js";
 import * as referenceImplementation from "../referenceImplementation.js";
-import { initBinding } from "../../src/binding.js";
 
 // start polling right after the call for every 1ms, throw error if after 100ms
 const { asyncShuffleList, asyncUnshuffleList } = withPollingParams(0, 1, 100);
@@ -28,7 +28,7 @@ describe("unshuffleList", () => {
 		},
 	];
 
-  before(async () => {
+  beforeAll(async () => {
     await initBinding();
   });