chore: move setHasher to applyPreset.ts

ChainSafe · Oct 2, 2023 · ff2fb5c · ff2fb5c
1 parent 96e319c
commit ff2fb5c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/packages/cli/src/applyPreset.ts b/packages/cli/src/applyPreset.ts
@@ -1,4 +1,13 @@
 // MUST import this file first before anything and not import any Lodestar code.
+
+// eslint-disable-next-line no-restricted-imports, import/no-extraneous-dependencies
+import {hasher} from "@chainsafe/persistent-merkle-tree/lib/hasher/as-sha256.js";
+// eslint-disable-next-line no-restricted-imports, import/no-extraneous-dependencies
+import {setHasher} from "@chainsafe/persistent-merkle-tree/lib/hasher/index.js";
+
+// without setting this first, persistent-merkle-tree will use noble instead
+setHasher(hasher);
+
 //
 // ## Rationale
 //

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -1,18 +1,11 @@
 #!/usr/bin/env node
 
-// eslint-disable-next-line no-restricted-imports, import/no-extraneous-dependencies
-import {hasher} from "@chainsafe/persistent-merkle-tree/lib/hasher/as-sha256.js";
-// eslint-disable-next-line no-restricted-imports, import/no-extraneous-dependencies
-import {setHasher} from "@chainsafe/persistent-merkle-tree/lib/hasher/index.js";
+// MUST import first to apply preset from args and set ssz hasher
+import("./applyPreset.js");
+import {YargsError} from "./util/index.js";
+import {getLodestarCli, yarg} from "./cli.js";
 import "source-map-support/register.js";
 
-// without setting this first, persistent-merkle-tree will use noble instead
-setHasher(hasher);
-
-// MUST import second to apply preset from args
-await import("./applyPreset.js");
-const {YargsError} = await import("./util/index.js");
-const {getLodestarCli, yarg} = await import("./cli.js");
 const lodestar = getLodestarCli();
 
 void lodestar

diff --git a/packages/prover/src/cli/applyPreset.ts b/packages/prover/src/cli/applyPreset.ts
@@ -1,4 +1,13 @@
 // MUST import this file first before anything and not import any Lodestar code.
+
+// eslint-disable-next-line no-restricted-imports, import/no-extraneous-dependencies
+import {hasher} from "@chainsafe/persistent-merkle-tree/lib/hasher/as-sha256.js";
+// eslint-disable-next-line no-restricted-imports, import/no-extraneous-dependencies
+import {setHasher} from "@chainsafe/persistent-merkle-tree/lib/hasher/index.js";
+
+// without setting this first, persistent-merkle-tree will use noble instead
+setHasher(hasher);
+
 //
 // ## Rationale
 //

diff --git a/packages/prover/src/cli/index.ts b/packages/prover/src/cli/index.ts
@@ -1,17 +1,11 @@
 #!/usr/bin/env node
 
-// eslint-disable-next-line no-restricted-imports, import/no-extraneous-dependencies
-import {hasher} from "@chainsafe/persistent-merkle-tree/lib/hasher/as-sha256.js";
-// eslint-disable-next-line no-restricted-imports, import/no-extraneous-dependencies
-import {setHasher} from "@chainsafe/persistent-merkle-tree/lib/hasher/index.js";
+// MUST import first to apply preset from args and set ssz hasher
+import("./applyPreset.js");
+import {YargsError} from "../utils/errors.js";
+import {getLodestarProverCli, yarg} from "./cli.js";
 import "source-map-support/register.js";
 
-// without setting this first, persistent-merkle-tree will use noble instead
-setHasher(hasher);
-// MUST import second to apply preset from args
-await import("./applyPreset.js");
-const {getLodestarProverCli, yarg} = await import("./cli.js");
-const {YargsError} = await import("../utils/errors.js");
 const prover = getLodestarProverCli();
 
 void prover