chore: update imports to match new folder structure

ChainSafe · Apr 4, 2024 · 7b5fbc0 · 7b5fbc0
1 parent 97e5aae
commit 7b5fbc0
Show file tree

Hide file tree

Showing 26 changed files with 30 additions and 28 deletions.
diff --git a/scripts/dev.ts b/scripts/dev.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import {resolve} from "path";
 import {watchWithCallback} from "./watch";
-import {cmdStringExec} from "../rebuild/tools/exec";
+import {exec} from "../utils";
 
 const DEBOUNCE_TIME = 500;
 const testCommand = "npm run test:unit";
@@ -20,16 +20,16 @@ void watchWithCallback({
   path: SRC_FOLDER,
   debounceTime: DEBOUNCE_TIME,
   cb: () =>
-    cmdStringExec(buildCommand, false)
+    exec(buildCommand, false)
       .then(console.log)
       // timeout set if undefined behavior creeps in.  keeps from hung tests
-      .then(() => cmdStringExec(testCommand, false, {timeout: 20 * 1000}))
+      .then(() => exec(testCommand, false, {timeout: 20 * 1000}))
       .then(console.log)
       .catch(console.error),
 });
 
 void watchWithCallback({
   path: TESTS_FOLDER,
   debounceTime: DEBOUNCE_TIME,
-  cb: () => cmdStringExec(testCommand, false).then(console.log).catch(console.error),
+  cb: () => exec(testCommand, false).then(console.log).catch(console.error),
 });
diff --git a/test/fuzz/testCases.ts b/test/fuzz/testCases.ts
@@ -1,4 +1,4 @@
-import {verify, SecretKey, PublicKey, Signature} from "../../rebuild/lib";
+import {verify, SecretKey, PublicKey, Signature} from "../../lib";
 
 export interface FuzzTestCase {
   name: string;

diff --git a/test/memory/memory.test.ts b/test/memory/memory.test.ts
@@ -1,5 +1,5 @@
 import {memoryTest} from "../utils/memory/testRunner";
-import * as napi from "../../rebuild/lib";
+import * as napi from "../../lib";
 
 const sk = napi.SecretKey.fromKeygen(Buffer.alloc(32, "*&@#"));
 const skBytes = sk.serialize();

diff --git a/test/perf/PublicKey.test.ts b/test/perf/PublicKey.test.ts
@@ -1,5 +1,5 @@
 import {itBench} from "@dapplion/benchmark";
-import * as blst from "../../rebuild/lib";
+import * as blst from "../../lib";
 import {arrayOfIndexes, getTestSet, getSerializedTestSet} from "../utils";
 
 const napiTestKey = getTestSet(0).publicKey;

diff --git a/test/perf/SecretKey.test.ts b/test/perf/SecretKey.test.ts
@@ -1,5 +1,5 @@
 import {itBench} from "@dapplion/benchmark";
-import * as blst from "../../rebuild/lib";
+import * as blst from "../../lib";
 import {keygenMaterial, commonMessage, getTestSet} from "../utils";
 
 const napiTestKey = getTestSet(0).secretKey;

diff --git a/test/perf/Signature.test.ts b/test/perf/Signature.test.ts
@@ -1,5 +1,5 @@
 import {itBench} from "@dapplion/benchmark";
-import * as blst from "../../rebuild/lib";
+import * as blst from "../../lib";
 import {arrayOfIndexes, getTestSet, getSerializedTestSet} from "../utils";
 
 const napiTestSignature = getTestSet(0).signature;

diff --git a/test/perf/functions.test.ts b/test/perf/functions.test.ts
@@ -1,5 +1,5 @@
 import {itBench} from "@dapplion/benchmark";
-import * as blst from "../../rebuild/lib";
+import * as blst from "../../lib";
 import {arrayOfIndexes, getTestSet, getTestSetSameMessage} from "../utils";
 
 describe("functions", () => {

diff --git a/test/perf/multithreading.test.ts b/test/perf/multithreading.test.ts
@@ -29,6 +29,7 @@ for (const addVerificationRandomness of [true, false]) {
     });
 
     after(async () => {
+      // eslint-disable-next-line no-console
       console.log({
         blsPoolSize: blsPool.blsPoolSize,
       });

diff --git a/test/spec/index.test.ts b/test/spec/index.test.ts
@@ -12,7 +12,7 @@ import {
   verify as VERIFY,
   aggregateVerify,
   fastAggregateVerify,
-} from "../../rebuild/lib";
+} from "../../lib";
 import {fromHex, toHex} from "../utils";
 
 // Example full path

diff --git a/test/unit/PublicKey.test.ts b/test/unit/PublicKey.test.ts
@@ -1,5 +1,5 @@
 import {expect} from "chai";
-import {BLST_CONSTANTS, CoordType, PublicKey, SecretKey} from "../../rebuild/lib";
+import {BLST_CONSTANTS, CoordType, PublicKey, SecretKey} from "../../lib";
 import {expectEqualHex, expectNotEqualHex, sullyUint8Array} from "../utils";
 import {validPublicKey, SECRET_KEY_BYTES, invalidInputs, badPublicKey, G1_POINT_AT_INFINITY} from "../__fixtures__";
 

diff --git a/test/unit/SecretKey.test.ts b/test/unit/SecretKey.test.ts
@@ -1,5 +1,5 @@
 import {expect} from "chai";
-import {PublicKey, SecretKey, Signature, BLST_CONSTANTS} from "../../rebuild/lib";
+import {PublicKey, SecretKey, Signature, BLST_CONSTANTS} from "../../lib";
 import {KEY_MATERIAL, SECRET_KEY_BYTES, invalidInputs} from "../__fixtures__";
 import {expectEqualHex, expectNotEqualHex} from "../utils";
 

diff --git a/test/unit/Signature.test.ts b/test/unit/Signature.test.ts
@@ -1,5 +1,5 @@
 import {expect} from "chai";
-import {BLST_CONSTANTS, CoordType, SecretKey, Signature} from "../../rebuild/lib";
+import {BLST_CONSTANTS, CoordType, SecretKey, Signature} from "../../lib";
 import {expectEqualHex, expectNotEqualHex, sullyUint8Array} from "../utils";
 import {G2_POINT_AT_INFINITY, KEY_MATERIAL, invalidInputs, validSignature} from "../__fixtures__";
 

diff --git a/test/unit/aggregatePublicKeys.test.ts b/test/unit/aggregatePublicKeys.test.ts
@@ -1,5 +1,5 @@
 import {expect} from "chai";
-import {aggregatePublicKeys, PublicKey} from "../../rebuild/lib";
+import {aggregatePublicKeys, PublicKey} from "../../lib";
 import {isEqualBytes, getTestSets} from "../utils";
 import {badPublicKey} from "../__fixtures__";
 

diff --git a/test/unit/aggregateSignatures.test.ts b/test/unit/aggregateSignatures.test.ts
@@ -1,5 +1,5 @@
 import {expect} from "chai";
-import {aggregateSignatures, Signature} from "../../rebuild/lib";
+import {aggregateSignatures, Signature} from "../../lib";
 import {isEqualBytes, getTestSets} from "../utils";
 import {badSignature} from "../__fixtures__";
 

diff --git a/test/unit/bindings.test.ts b/test/unit/bindings.test.ts
@@ -1,5 +1,5 @@
 import {expect} from "chai";
-import * as bindings from "../../rebuild/lib";
+import * as bindings from "../../lib";
 
 describe("bindings", () => {
   describe("exports", () => {

diff --git a/test/unit/utils.test.ts b/test/unit/utils.test.ts
@@ -1,5 +1,5 @@
 import {expect} from "chai";
-import {aggregateSignatures, fastAggregateVerify, verify, verifyMultipleAggregateSignatures} from "../../rebuild/lib";
+import {aggregateSignatures, fastAggregateVerify, verify, verifyMultipleAggregateSignatures} from "../../lib";
 import {
   BlsMultiThreading,
   arrayOfIndexes,

diff --git a/test/unit/verify.test.ts b/test/unit/verify.test.ts
@@ -6,7 +6,7 @@ import {
   asyncVerify,
   fastAggregateVerify,
   verify,
-} from "../../rebuild/lib";
+} from "../../lib";
 import {sullyUint8Array, getTestSet} from "../utils";
 import {TestSet} from "../utils/types";
 

diff --git a/test/unit/verifyMultipleAggregateSignatures.test.ts b/test/unit/verifyMultipleAggregateSignatures.test.ts
@@ -1,5 +1,5 @@
 import {expect} from "chai";
-import {asyncVerifyMultipleAggregateSignatures, verifyMultipleAggregateSignatures} from "../../rebuild/lib";
+import {asyncVerifyMultipleAggregateSignatures, verifyMultipleAggregateSignatures} from "../../lib";
 import {getTestSets} from "../utils";
 
 describe("Verify Multiple Aggregate Signatures", () => {

diff --git a/test/utils/multithreading/blsMultiThreading.ts b/test/utils/multithreading/blsMultiThreading.ts
@@ -1,4 +1,4 @@
-import {PublicKey} from "../../../rebuild/lib";
+import {PublicKey} from "../../../lib";
 import {chunkifyMaximizeChunkSize} from "../../utils";
 import {
   BlsMultiThreadWorkerPoolOptions,

diff --git a/test/utils/multithreading/helpers.ts b/test/utils/multithreading/helpers.ts
@@ -1,5 +1,5 @@
 import crypto from "crypto";
-import {aggregateSignatures} from "../../../rebuild/lib";
+import {aggregateSignatures} from "../../../lib";
 import {getTestSet, getTestSetSameMessage} from "../testSets";
 import {shuffle} from "../helpers";
 import {

diff --git a/test/utils/multithreading/queuedJob.ts b/test/utils/multithreading/queuedJob.ts
@@ -1,4 +1,4 @@
-import {CoordType, PublicKey, Signature, aggregatePublicKeys, aggregateSignatures} from "../../../rebuild/lib";
+import {CoordType, PublicKey, Signature, aggregatePublicKeys, aggregateSignatures} from "../../../lib";
 import {BlsWorkRequest, ISignatureSet, SignatureSetType, VerifySignatureOpts} from "./types";
 import {LinkedList} from "./array";
 import {getAggregatePublicKey} from "./verify";

diff --git a/test/utils/multithreading/runWorkRequests.ts b/test/utils/multithreading/runWorkRequests.ts
@@ -1,4 +1,4 @@
-import {SignatureSet} from "../../../rebuild/lib";
+import {SignatureSet} from "../../../lib";
 import {chunkifyMaximizeChunkSize} from "../../utils";
 import {WorkResult, WorkResultCode, BlsWorkResult, BlsWorkRequest} from "./types";
 import {asyncVerifyNapiSignatureSets} from "./verify";

diff --git a/test/utils/multithreading/types.ts b/test/utils/multithreading/types.ts
@@ -1,4 +1,4 @@
-import {PublicKey, Signature} from "../../../rebuild/lib";
+import {PublicKey, Signature} from "../../../lib";
 import {SignatureSetArray} from "../types";
 
 export enum SignatureSetType {

diff --git a/test/utils/multithreading/verify.ts b/test/utils/multithreading/verify.ts
@@ -7,7 +7,7 @@ import {
   asyncVerifyMultipleAggregateSignatures,
   verify,
   verifyMultipleAggregateSignatures,
-} from "../../../rebuild/lib";
+} from "../../../lib";
 import {ISignatureSet, SignatureSetType} from "./types";
 
 const MIN_SET_COUNT_TO_BATCH = 2;

diff --git a/test/utils/testSets.ts b/test/utils/testSets.ts
@@ -1,4 +1,5 @@
-import {SecretKey, Signature, BLST_CONSTANTS} from "../../rebuild/lib";
+import crypto from "crypto";
+import {SecretKey, Signature, BLST_CONSTANTS} from "../../lib";
 import {TestSet, SerializedSet} from "./types";
 import {arrayOfIndexes} from "./helpers";
 

diff --git a/test/utils/types.ts b/test/utils/types.ts
@@ -1,4 +1,4 @@
-import * as bindings from "../../rebuild/lib";
+import * as bindings from "../../lib";
 
 export type BufferLike = string | Uint8Array | Buffer | bindings.Serializable;