Re-org beforeValue and testCase helpers

ChainSafe · May 12, 2022 · 313ff52 · 313ff52
1 parent 09bf749
commit 313ff52
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 43 deletions.
diff --git a/packages/beacon-state-transition/test/perf/altair/epoch/epoch.test.ts b/packages/beacon-state-transition/test/perf/altair/epoch/epoch.test.ts
@@ -7,8 +7,7 @@ import {
   CachedBeaconStateAltair,
   beforeProcessEpoch,
 } from "../../../../src";
-import {getNetworkCachedState} from "../../../utils/testFileCache";
-import {beforeValue, LazyValue} from "../../util";
+import {getNetworkCachedState, beforeValue, LazyValue} from "../../../utils";
 import {StateEpoch} from "../../types";
 import {altairState} from "../../params";
 

diff --git a/packages/beacon-state-transition/test/perf/phase0/epoch/epoch.test.ts b/packages/beacon-state-transition/test/perf/phase0/epoch/epoch.test.ts
@@ -7,8 +7,7 @@ import {
   CachedBeaconStatePhase0,
   beforeProcessEpoch,
 } from "../../../../src";
-import {getNetworkCachedState} from "../../../utils/testFileCache";
-import {beforeValue, LazyValue} from "../../util";
+import {getNetworkCachedState, beforeValue, LazyValue} from "../../../utils";
 import {processParticipationRecordUpdates} from "../../../../src/phase0/epoch/processParticipationRecordUpdates";
 import {StateEpoch} from "../../types";
 import {phase0State} from "../../params";

diff --git a/packages/beacon-state-transition/test/perf/util.ts b/packages/beacon-state-transition/test/perf/util.ts
@@ -439,41 +439,3 @@ export function generateTestCachedBeaconStateOnlyValidators({
     index2pubkey,
   });
 }
-
-const initialValue = null;
-export type LazyValue<T> = {value: T};
-
-/**
- * Register a callback to compute a value in the before() block of mocha tests
- * ```ts
- * const state = beforeValue(() => getState())
- * it("test", () => {
- *   doTest(state.value)
- * })
- * ```
- */
-export function beforeValue<T>(fn: () => T | Promise<T>, timeout?: number): LazyValue<T> {
-  let value: T = (initialValue as unknown) as T;
-
-  before(async function () {
-    this.timeout(timeout ?? 300_000);
-    value = await fn();
-  });
-
-  return new Proxy<{value: T}>(
-    {value},
-    {
-      get: function (target, prop) {
-        if (prop === "value") {
-          if (value === initialValue) {
-            throw Error("beforeValue has not yet run the before() block");
-          } else {
-            return value;
-          }
-        } else {
-          return undefined;
-        }
-      },
-    }
-  );
-}
diff --git a/packages/beacon-state-transition/test/utils/beforeValue.ts b/packages/beacon-state-transition/test/utils/beforeValue.ts
@@ -0,0 +1,36 @@
+export type LazyValue<T> = {value: T};
+
+/**
+ * Register a callback to compute a value in the before() block of mocha tests
+ * ```ts
+ * const state = beforeValue(() => getState())
+ * it("test", () => {
+ *   doTest(state.value)
+ * })
+ * ```
+ */
+export function beforeValue<T>(fn: () => T | Promise<T>, timeout?: number): LazyValue<T> {
+  let value: T = (null as unknown) as T;
+
+  before(async function () {
+    this.timeout(timeout ?? 300_000);
+    value = await fn();
+  });
+
+  return new Proxy<{value: T}>(
+    {value},
+    {
+      get: function (target, prop) {
+        if (prop === "value") {
+          if (value === null) {
+            throw Error("beforeValue has not yet run the before() block");
+          } else {
+            return value;
+          }
+        } else {
+          return undefined;
+        }
+      },
+    }
+  );
+}
diff --git a/packages/beacon-state-transition/test/utils/index.ts b/packages/beacon-state-transition/test/utils/index.ts
@@ -0,0 +1,2 @@
+export * from "./beforeValue";
+export * from "./testFileCache";
diff --git a/packages/lodestar/test/perf/chain/verifyImportBlocks.test.ts b/packages/lodestar/test/perf/chain/verifyImportBlocks.test.ts
@@ -3,7 +3,7 @@ import {
   beforeValue,
   getNetworkCachedState,
   getNetworkCachedBlock,
-} from "@chainsafe/lodestar-beacon-state-transition/test/perf/util";
+} from "@chainsafe/lodestar-beacon-state-transition/test/utils";
 import {rangeSyncTest} from "@chainsafe/lodestar-beacon-state-transition/test/perf/params";
 import {config} from "@chainsafe/lodestar-config/default";
 import {SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY, SLOTS_PER_EPOCH} from "@chainsafe/lodestar-params";