Revert "refactor: slightly better marshal identification for diagnost…

…ics (#9153)" This reverts commit f8ea4a8.
Agoric · Jun 14, 2024 · 00b3e76 · 00b3e76
1 parent 97fa24a
commit 00b3e76
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/packages/SwingSet/src/controller/initializeKernel.js b/packages/SwingSet/src/controller/initializeKernel.js
@@ -210,7 +210,7 @@ export async function initializeKernel(config, kernelStorage, options = {}) {
       serializeBodyFormat: 'smallcaps',
       // TODO Temporary hack.
       // See https://github.com/Agoric/agoric-sdk/issues/2780
-      errorIdNum: 60_000,
+      errorIdNum: 60000,
     });
     // @ts-expect-error xxx
     const args = kunser(m.serialize(harden([vatObj0s, deviceObj0s])));

diff --git a/packages/SwingSet/src/devices/lib/deviceTools.js b/packages/SwingSet/src/devices/lib/deviceTools.js
@@ -74,11 +74,11 @@ export function buildSerializationTools(syscall, deviceName) {
   }
 
   const m = makeMarshal(convertValToSlot, convertSlotToVal, {
-    marshalName: `deviceTools:${deviceName}`,
+    marshalName: `device:${deviceName}`,
     serializeBodyFormat: 'smallcaps',
     // TODO Temporary hack.
     // See https://github.com/Agoric/agoric-sdk/issues/2780
-    errorIdNum: 40_000,
+    errorIdNum: 60000,
   });
 
   // for invoke(), these will unserialize the arguments, and serialize the

diff --git a/packages/SwingSet/src/kernel/deviceSlots.js b/packages/SwingSet/src/kernel/deviceSlots.js
@@ -107,7 +107,7 @@ export function makeDeviceSlots(
     serializeBodyFormat: 'smallcaps',
     // TODO Temporary hack.
     // See https://github.com/Agoric/agoric-sdk/issues/2780
-    errorIdNum: 50_000,
+    errorIdNum: 50000,
   });
 
   function PresenceHandler(importSlot) {

diff --git a/packages/swingset-liveslots/src/liveslots.js b/packages/swingset-liveslots/src/liveslots.js
@@ -563,7 +563,7 @@ function build(
     serializeBodyFormat: 'smallcaps',
     // TODO Temporary hack.
     // See https://github.com/Agoric/agoric-sdk/issues/2780
-    errorIdNum: 70_000,
+    errorIdNum: 70000,
     marshalSaveError: err =>
       // By sending this to `console.warn`, under cosmic-swingset this is
       // controlled by the `console` option given to makeLiveSlots.

diff --git a/packages/swingset-liveslots/tools/fakeVirtualSupport.js b/packages/swingset-liveslots/tools/fakeVirtualSupport.js
@@ -242,9 +242,6 @@ export function makeFakeLiveSlotsStuff(options = {}) {
 
   const marshal = makeMarshal(convertValToSlot, convertSlotToVal, {
     serializeBodyFormat: 'smallcaps',
-    marshalName: 'fakeLiveSlots',
-    errorIdNum: 80_000,
-    marshalSaveError: _err => {},
   });
 
   function registerEntry(baseRef, val, valIsCohort) {

diff --git a/packages/wallet/api/src/lib-dehydrate.js b/packages/wallet/api/src/lib-dehydrate.js
@@ -339,7 +339,7 @@ export const makeDehydrator = (initialUnnamedCount = 0) => {
       marshalName: 'hydration',
       // TODO Temporary hack.
       // See https://github.com/Agoric/agoric-sdk/issues/2780
-      errorIdNum: 30_000,
+      errorIdNum: 30000,
       serializeBodyFormat: 'smallcaps',
     },
   );