fix: osx compilation (#152)

* fix: osx compilation * chore: address comments
ChainSafe · Feb 8, 2024 · d79efcc · d79efcc
1 parent 1d7508f
commit d79efcc
Show file tree

Hide file tree

Showing 8 changed files with 500 additions and 547 deletions.
diff --git a/package.json b/package.json
@@ -85,8 +85,8 @@
   "devDependencies": {
     "@chainsafe/blst": "^0.2.4",
     "@chainsafe/eslint-plugin-node": "^11.2.3",
-    "@chainsafe/lodestar-spec-test-util": "^0.18.0",
     "@chainsafe/threads": "^1.9.0",
+    "@lodestar/spec-test-util": "1.13.0",
     "@types/chai": "^4.2.9",
     "@types/mocha": "^10.0.0",
     "@types/randombytes": "^2.0.0",
@@ -116,7 +116,7 @@
   },
   "resolutions": {
     "mocha": "^9.2.2",
-    "v8-profiler-next": "1.3.0"
+    "v8-profiler-next": "1.10.0"
   },
   "peerDependencies": {
     "@chainsafe/blst": "^0.2.4"

diff --git a/test/downloadSpecTests.ts b/test/downloadSpecTests.ts
@@ -1,4 +1,4 @@
-import {downloadTests} from "@chainsafe/lodestar-spec-test-util";
+import {downloadTests} from "@lodestar/spec-test-util";
 import {SPEC_TEST_VERSION, SPEC_TESTS_DIR, SPEC_TEST_TO_DOWNLOAD} from "./params.js";
 
 /* eslint-disable no-console */
@@ -8,6 +8,7 @@ downloadTests(
     specVersion: SPEC_TEST_VERSION,
     outputDir: SPEC_TESTS_DIR,
     testsToDownload: SPEC_TEST_TO_DOWNLOAD,
+    specTestsRepoUrl: "https://github.com/ethereum/consensus-spec-tests",
   },
   console.log
 ).catch((e) => {

diff --git a/test/spec/aggregate.test.ts b/test/spec/aggregate.test.ts
@@ -1,5 +1,5 @@
 import path from "path";
-import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
+import {describeDirectorySpecTest, InputType} from "@lodestar/spec-test-util";
 import {bytesToHex, hexToBytes} from "../../src/helpers/index.js";
 import {SPEC_TESTS_DIR} from "../params.js";
 import {describeForAllImplementations} from "../switch.js";
@@ -10,6 +10,7 @@ interface IAggregateSigsTestCase {
     input: string[];
     output: string;
   };
+  meta?: unknown;
 }
 
 describeForAllImplementations((bls) => {

diff --git a/test/spec/aggregate_verify.test.ts b/test/spec/aggregate_verify.test.ts
@@ -1,5 +1,5 @@
 import path from "path";
-import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
+import {describeDirectorySpecTest, InputType} from "@lodestar/spec-test-util";
 import {hexToBytes} from "../../src/helpers/index.js";
 import {SPEC_TESTS_DIR} from "../params.js";
 import {describeForAllImplementations} from "../switch.js";
@@ -13,6 +13,7 @@ interface IAggregateSigsVerifyTestCase {
     };
     output: boolean;
   };
+  meta?: unknown;
 }
 
 describeForAllImplementations((bls) => {

diff --git a/test/spec/fast_aggregate_verify.test.ts b/test/spec/fast_aggregate_verify.test.ts
@@ -1,5 +1,5 @@
 import path from "path";
-import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
+import {describeDirectorySpecTest, InputType} from "@lodestar/spec-test-util";
 import {hexToBytes} from "../../src/helpers/index.js";
 import {SPEC_TESTS_DIR} from "../params.js";
 import {describeForAllImplementations} from "../switch.js";
@@ -14,6 +14,7 @@ interface IAggregateSigsVerifyTestCase {
     };
     output: boolean;
   };
+  meta?: unknown;
 }
 
 describeForAllImplementations((bls) => {

diff --git a/test/spec/sign.test.ts b/test/spec/sign.test.ts
@@ -1,5 +1,5 @@
 import path from "path";
-import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
+import {describeDirectorySpecTest, InputType} from "@lodestar/spec-test-util";
 import {bytesToHex, hexToBytes} from "../../src/helpers/index.js";
 import {SPEC_TESTS_DIR} from "../params.js";
 import {describeForAllImplementations} from "../switch.js";
@@ -13,6 +13,7 @@ interface ISignMessageTestCase {
     };
     output: string;
   };
+  meta?: unknown;
 }
 
 describeForAllImplementations((bls) => {

diff --git a/test/spec/verify.test.ts b/test/spec/verify.test.ts
@@ -1,5 +1,5 @@
 import path from "path";
-import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
+import {describeDirectorySpecTest, InputType} from "@lodestar/spec-test-util";
 import {hexToBytes} from "../../src/helpers/index.js";
 import {SPEC_TESTS_DIR} from "../params.js";
 import {describeForAllImplementations} from "../switch.js";
@@ -13,6 +13,7 @@ interface IVerifyTestCase {
     };
     output: boolean;
   };
+  meta?: unknown;
 }
 
 describeForAllImplementations((bls) => {