WIP checking rust-random/getrandom#214 and rust-random/getrandom#215

to reproduce: $ OPTIC__BUILD_SKIP__UI=yes task postpull $ yarn workspace @useoptic/ui-v2 test
opticdev · May 18, 2021 · 2a3fcf7 · 2a3fcf7
1 parent 588a76e
commit 2a3fcf7
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/workspaces/diff-engine-wasm/engine/Cargo.lock b/workspaces/diff-engine-wasm/engine/Cargo.lock
diff --git a/workspaces/diff-engine-wasm/engine/Cargo.toml b/workspaces/diff-engine-wasm/engine/Cargo.toml
@@ -21,6 +21,8 @@ wasm-logger = "0.2.0"
 uuid = { version = "0.8.2", features = ["v4", "wasm-bindgen"] }
 
 [dependencies.getrandom]
+git = "https://github.com/rust-random/getrandom"
+branch = "detect"
 features = ["js"]
 
 [dependencies.optic_diff_engine]

diff --git a/workspaces/diff-engine/Cargo.toml b/workspaces/diff-engine/Cargo.toml
@@ -34,6 +34,11 @@ tokio-util = { version = "0.6.3", features = ["codec"], optional = true }
 tokio-stream = { version= "0.1.2", features = ["fs", "io-util"], optional = true }
 uuid = { version = "0.8.2", features = ["v4", "wasm-bindgen"] }
 
+[dependencies.getrandom]
+git = "https://github.com/rust-random/getrandom"
+branch = "detect"
+features = ["js"]
+
 [dev-dependencies]
 insta = "0.16.1"
 petgraph-evcxr = "*"

diff --git a/workspaces/ui-v2/src/lib/__tests/diff-helpers/universes/makeCurrentSpecContext.ts b/workspaces/ui-v2/src/lib/__tests/diff-helpers/universes/makeCurrentSpecContext.ts
@@ -12,11 +12,6 @@ import { newDeterministicIdGenerator } from '<src>/lib/domain-id-generator';
 import * as opticEngine from '@useoptic/diff-engine-wasm/engine/build';
 import { AllPathsQuery } from '<src>/optic-components/hooks/usePathsHook';
 
-//@GOTCHA: for some reason, probably because of jest, our wasm code thinks it is running in the browser even though it is running in node because of the presence of global.self:
-//@REF: https://github.com/rust-random/getrandom/issues/214
-//@ts-ignore
-delete global.self;
-
 export async function makeCurrentSpecContext(
   events: any[],
   query: (spectacleInput: SpectacleInput<any>) => Promise<any>
@@ -52,7 +47,7 @@ export async function makeCurrentSpecContext(
     currentSpecResponses: responses,
     currentSpecRequests: requests,
     domainIds: newDeterministicIdGenerator(),
-    idGeneratorStrategy: 'sequential',
+    idGeneratorStrategy: 'random',
     opticEngine,
   };
 }