Merge pull request #1119 from cloudflare/jsnell/miscellaneous-jsg-cle…

…anups
cloudflare · Sep 5, 2023 · 236fc37 · 236fc37
2 parents 74bf750 + 489fc6e
commit 236fc37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/workerd/api/streams/queue-test.c++ b/src/workerd/api/streams/queue-test.c++
@@ -149,7 +149,7 @@ KJ_TEST("ValueQueue erroring works") {
 
   ValueQueue queue(2);
 
-  queue.error(js, js.v8Ref(v8::Exception::Error(jsg::v8StrIntern(js.v8Isolate, "boom"_kj))));
+  queue.error(js, js.v8Ref(js.v8Error("boom"_kj)));
 
   KJ_ASSERT(queue.desiredSize() == 0);
 
@@ -333,7 +333,7 @@ KJ_TEST("ValueQueue errors consumer with multiple-reads") {
   read(js, consumer).then(js, readContinuation, errorContinuation);
   read(js, consumer).then(js, readContinuation, errorContinuation);
 
-  queue.error(js, js.v8Ref(v8::Exception::Error(jsg::v8StrIntern(js.v8Isolate, "boom"_kj))));
+  queue.error(js, js.v8Ref(js.v8Error("boom"_kj)));
 
   js.runMicrotasks();
 }
@@ -417,7 +417,7 @@ KJ_TEST("ByteQueue erroring works") {
 
   ByteQueue queue(2);
 
-  queue.error(js, js.v8Ref(v8::Exception::Error(jsg::v8StrIntern(js.v8Isolate, "boom"_kj))));
+  queue.error(js, js.v8Ref(js.v8Error("boom"_kj)));
 
   KJ_ASSERT(queue.desiredSize() == 0);
 

diff --git a/src/workerd/server/workerd-api.c++ b/src/workerd/server/workerd-api.c++
@@ -252,7 +252,7 @@ kj::Array<Worker::Script::CompiledGlobal> WorkerdApiIsolate::compileScriptGlobal
   auto compiledGlobals = kj::heapArrayBuilder<Worker::Script::CompiledGlobal>(wasmCount);
   for (auto binding: conf.getBindings()) {
     if (binding.isWasmModule()) {
-      auto name = jsg::v8StrIntern(lock.v8Isolate, binding.getName());
+      auto name = lock.str(binding.getName());
       auto value = Impl::compileWasmGlobal(lock, binding.getWasmModule(), observer);
 
       compiledGlobals.add(Worker::Script::CompiledGlobal {