refactor: remove migrated common

.github/workflows/test-all-packages.yml

@@ -145,9 +145,6 @@ jobs:
       - name: yarn test (notifier)
         if: (success() || failure())
         run: cd packages/notifier && yarn ${{ steps.vars.outputs.test }} | $TEST_COLLECT
-      - name: yarn test (same-structure)
-        if: (success() || failure())
-        run: cd packages/same-structure && yarn ${{ steps.vars.outputs.test }} | $TEST_COLLECT
       - name: yarn test (sparse-ints)
         if: (success() || failure())
         run: cd packages/sparse-ints && yarn ${{ steps.vars.outputs.test }} | $TEST_COLLECT

packages/ERTP/package.json

@@ -43,7 +43,9 @@
     "@agoric/notifier": "^0.6.2",
     "@agoric/store": "^0.9.2",
     "@agoric/vat-data": "^0.5.2",
+    "@endo/errors": "^1.0.2",
     "@endo/eventual-send": "^1.1.0",
+    "@endo/exo": "^1.1.0",
     "@endo/far": "^1.0.2",
     "@endo/marshal": "^1.1.0",
     "@endo/nat": "^5.0.2",

packages/ERTP/src/amountMath.js

@@ -1,12 +1,12 @@
+import { quote as q, throwRedacted as Fail } from '@endo/errors';
 import { passStyleOf, assertRemotable, assertRecord } from '@endo/marshal';
+import { M, matches } from '@endo/patterns';
 
-import { M, matches } from '@agoric/store';
 import { natMathHelpers } from './mathHelpers/natMathHelpers.js';
 import { setMathHelpers } from './mathHelpers/setMathHelpers.js';
 import { copySetMathHelpers } from './mathHelpers/copySetMathHelpers.js';
 import { copyBagMathHelpers } from './mathHelpers/copyBagMathHelpers.js';
 
-const { quote: q, Fail } = assert;
 
 /**
  * Constants for the kinds of assets we support.

packages/ERTP/src/displayInfo.js

@@ -1,7 +1,7 @@
 // @jessie-check
 
-import { Fail } from '@agoric/assert';
-import { mustMatch } from '@agoric/store';
+import { throwRedacted as Fail } from '@endo/errors';
+import { mustMatch } from '@endo/patterns';
 
 import { DisplayInfoShape } from './typeGuards.js';
 

packages/ERTP/src/issuerKit.js

@@ -1,7 +1,7 @@
 // @jessie-check
 
-import { assert } from '@agoric/assert';
-import { assertPattern } from '@agoric/store';
+import { assert } from '@endo/errors';
+import { assertPattern } from '@endo/patterns';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
 
 import { AssetKind, assertAssetKind } from './amountMath.js';

packages/ERTP/src/legacy-payment-helpers.js

@@ -1,10 +1,10 @@
 // @jessie-check
 
-import { mustMatch } from '@agoric/store';
+import { throwRedacted as Fail } from '@endo/errors';
 import { E } from '@endo/far';
-import { AmountMath } from './amountMath.js';
+import { mustMatch } from '@endo/patterns';
 
-const { Fail } = assert;
+import { AmountMath } from './amountMath.js';
 
 /**
  * @file This file contains safer helper function alternatives to the similarly

packages/ERTP/src/mathHelpers/copyBagMathHelpers.js

@@ -9,7 +9,7 @@ import {
   bagIsSuperbag,
   bagUnion,
   bagDisjointSubtract,
-} from '@agoric/store';
+} from '@endo/patterns';
 import '../types-ambient.js';
 
 /** @type {CopyBag} */

packages/ERTP/src/mathHelpers/copySetMathHelpers.js

@@ -9,7 +9,7 @@ import {
   setIsSuperset,
   setDisjointUnion,
   setDisjointSubtract,
-} from '@agoric/store';
+} from '@endo/patterns';
 import '../types-ambient.js';
 
 /** @type {CopySet} */

packages/ERTP/src/mathHelpers/natMathHelpers.js

@@ -1,10 +1,10 @@
 // @jessie-check
 
+import { throwRedacted as Fail } from '@endo/errors';
 import { Nat, isNat } from '@endo/nat';
 
 import '../types-ambient.js';
 
-const { Fail } = assert;
 const empty = 0n;
 
 /**

packages/ERTP/src/mathHelpers/setMathHelpers.js

@@ -8,7 +8,7 @@ import {
   elementsDisjointSubtract,
   coerceToElements,
   elementsCompare,
-} from '@agoric/store';
+} from '@endo/patterns';
 import '../types-ambient.js';
 
 // Operations for arrays with unique objects identifying and providing

packages/ERTP/src/payment.js

@@ -1,6 +1,6 @@
 // @jessie-check
 
-import { initEmpty } from '@agoric/store';
+import { initEmpty } from '@endo/exo';
 import { prepareExoClass } from '@agoric/vat-data';
 
 /** @typedef {import('@endo/patterns').MethodGuard} MethodGuard */

packages/ERTP/src/paymentLedger.js

@@ -1,8 +1,15 @@
 // @jessie-check
 
 /* eslint-disable no-use-before-define */
+import {
+  redacted as X,
+  quote as q,
+  throwRedacted as Fail,
+  note as errorNote,
+} from '@endo/errors';
 import { isPromise } from '@endo/promise-kit';
-import { mustMatch, M, keyEQ } from '@agoric/store';
+import { mustMatch, M, keyEQ } from '@endo/patterns';
+
 import {
   provideDurableWeakMapStore,
   prepareExo,
@@ -17,8 +24,6 @@ import { BrandI, makeIssuerInterfaces } from './typeGuards.js';
 
 /** @typedef {import('@agoric/vat-data').Baggage} Baggage */
 
-const { details: X, quote: q, Fail } = assert;
-
 /**
  * @param {Brand} brand
  * @param {AssetKind} assetKind
@@ -131,7 +136,7 @@ export const preparePaymentLedger = (
       try {
         optShutdownWithFailure(reason);
       } catch (errInShutdown) {
-        assert.note(errInShutdown, X`Caused by: ${reason}`);
+        errorNote(errInShutdown, X`Caused by: ${reason}`);
         throw errInShutdown;
       }
     }

packages/ERTP/src/purse.js

@@ -1,4 +1,6 @@
-import { M } from '@agoric/store';
+import { throwRedacted as Fail } from '@endo/errors';
+import { M } from '@endo/patterns';
+
 import { prepareExoClassKit, makeScalarBigSetStore } from '@agoric/vat-data';
 import { AmountMath } from './amountMath.js';
 import { makeTransientNotifierKit } from './transientNotifier.js';
@@ -7,7 +9,6 @@ import { makeTransientNotifierKit } from './transientNotifier.js';
 /** @typedef {import('@endo/patterns').InterfaceGuard} InterfaceGuard */
 /** @typedef {import('@agoric/vat-data').Baggage} Baggage */
 
-const { Fail } = assert;
 
 /**
  * @param {Baggage} issuerBaggage

packages/ERTP/test/unitTests/mathHelpers/test-copyBagMathHelpers.js

@@ -3,7 +3,7 @@ import { makeTagged } from '@endo/marshal';
 import {
   getCopyBagEntries,
   makeCopyBagFromElements as makeBag,
-} from '@agoric/store';
+} from '@endo/patterns';
 
 import { AmountMath as m, AssetKind } from '../../../src/index.js';
 import { mockBrand } from './mockBrand.js';

packages/ERTP/test/unitTests/mathHelpers/test-copySetMathHelpers.js

@@ -1,5 +1,6 @@
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { getCopySetKeys, makeCopySet } from '@agoric/store';
+
+import { getCopySetKeys, makeCopySet } from '@endo/patterns';
 
 import { AmountMath as m, AssetKind } from '../../../src/index.js';
 import { mockBrand } from './mockBrand.js';

packages/ERTP/test/unitTests/mathHelpers/test-natMathHelpers.js

@@ -1,7 +1,8 @@
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { M } from '@agoric/store';
 
 import { Far } from '@endo/marshal';
+import { M } from '@endo/patterns';
+
 import { AmountMath as m, AssetKind } from '../../../src/index.js';
 import { mockBrand } from './mockBrand.js';
 

packages/ERTP/test/unitTests/test-amountProperties.js

@@ -1,5 +1,6 @@
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { makeCopyBag } from '@agoric/store';
+
+import { makeCopyBag } from '@endo/patterns';
 import { fc } from '@fast-check/ava';
 
 import { AmountMath as m, AssetKind } from '../../src/index.js';

packages/ERTP/test/unitTests/test-mintObj.js

@@ -1,7 +1,8 @@
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
 
-import { initEmpty, M } from '@agoric/store';
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
+import { M } from '@endo/patterns';
+import { initEmpty } from '@endo/exo';
 
 import { defineDurableKind, makeKindHandle } from '@agoric/vat-data';
 import { makeIssuerKit, AssetKind, AmountMath } from '../../src/index.js';

packages/ERTP/test/unitTests/test-recovery.js

@@ -1,5 +1,5 @@
 import { test } from '@agoric/swingset-vat/tools/prepare-test-env-ava.js';
-import { getCopySetKeys, keyEQ, makeCopySet } from '@agoric/store';
+import { getCopySetKeys, keyEQ, makeCopySet } from '@endo/patterns';
 
 import { makeIssuerKit, AmountMath } from '../../src/index.js';
 

packages/SwingSet/package.json

@@ -40,10 +40,13 @@
     "@agoric/xsnap-lockdown": "^0.14.0",
     "@endo/base64": "^1.0.1",
     "@endo/bundle-source": "^3.0.2",
+    "@endo/common": "^1.0.2",
     "@endo/captp": "^4.0.2",
     "@endo/check-bundle": "^1.0.2",
     "@endo/compartment-mapper": "^1.1.0",
+    "@endo/errors": "^1.0.2",
     "@endo/eventual-send": "^1.1.0",
+    "@endo/exo": "^1.1.0",
     "@endo/far": "^1.0.2",
     "@endo/import-bundle": "^1.0.2",
     "@endo/init": "^1.0.2",

packages/SwingSet/src/controller/initializeSwingset.js

@@ -2,10 +2,11 @@
 import fs from 'fs';
 import path from 'path';
 
-import { assert, Fail } from '@agoric/assert';
-import { makeTracer } from '@agoric/internal';
-import { mustMatch } from '@agoric/store';
+import { assert, throwRedacted as Fail } from '@endo/errors';
 import bundleSource from '@endo/bundle-source';
+import { mustMatch } from '@endo/patterns';
+
+import { makeTracer } from '@agoric/internal';
 import { resolve as resolveModuleSpecifier } from 'import-meta-resolve';
 import { ManagerType } from '../typeGuards.js';
 import { provideBundleCache } from '../../tools/bundleTool.js';

packages/SwingSet/src/typeGuards.js

@@ -1,5 +1,5 @@
 // @jessie-check
-import { M } from '@agoric/store';
+import { M } from '@endo/patterns';
 
 export const ManagerType = M.or(
   'xsnap',

packages/SwingSet/test/upgrade/test-upgrade.js

@@ -4,7 +4,7 @@ import { test } from '../../tools/prepare-test-env-ava.js';
 
 import { assert } from '@agoric/assert';
 import bundleSource from '@endo/bundle-source';
-import { objectMap } from '@agoric/internal';
+import { objectMap } from '@endo/common/object-map.js';
 import { kser, kunser, krefOf } from '@agoric/kmarshal';
 import { initSwingStore } from '@agoric/swing-store';
 import { parseReachableAndVatSlot } from '../../src/kernel/state/reachable.js';

packages/SwingSet/test/upgrade/vat-ulrik-1.js

@@ -1,6 +1,6 @@
 import { Far, E } from '@endo/far';
 import { makePromiseKit } from '@endo/promise-kit';
-import { initEmpty } from '@agoric/store';
+import { initEmpty } from '@endo/exo';
 import {
   makeKindHandle,
   defineDurableKind,

packages/SwingSet/test/upgrade/vat-ulrik-2.js

@@ -1,6 +1,7 @@
 import { Far, E } from '@endo/far';
-import { assert } from '@agoric/assert';
-import { initEmpty } from '@agoric/store';
+import { assert } from '@endo/errors';
+import { initEmpty } from '@endo/exo';
+
 import { defineDurableKind, defineDurableKindMulti } from '@agoric/vat-data';
 
 const initialize = (name, imp, value) => {

packages/SwingSet/test/vat-exporter.js

@@ -1,5 +1,7 @@
 import { Far } from '@endo/far';
-import { M, defineExoClass } from '@agoric/store';
+import { M } from '@endo/patterns';
+import { defineExoClass } from '@endo/exo';
+
 import {
   defineVirtualExoClass,
   prepareExoClass,

packages/SwingSet/test/virtualObjects/vat-orphan-bob.js

@@ -1,5 +1,5 @@
 import { Far } from '@endo/far';
-import { initEmpty } from '@agoric/store';
+import { initEmpty } from '@endo/exo';
 import { defineKind, defineKindMulti } from '@agoric/vat-data';
 
 const { getPrototypeOf } = Object;

packages/SwingSet/tools/bootstrap-relay.js

@@ -1,5 +1,5 @@
 import { assert } from '@agoric/assert';
-import { objectMap } from '@agoric/internal';
+import { objectMap } from '@endo/common/object-map.js';
 import { Far, E } from '@endo/far';
 import { buildManualTimer } from './manual-timer.js';
 

packages/agoric-cli/package.json

@@ -58,8 +58,9 @@
     "@cosmjs/proto-signing": "^0.30.1",
     "@cosmjs/stargate": "^0.30.1",
     "@endo/bundle-source": "^3.0.2",
-    "@endo/captp": "^4.0.2",
+    "@endo/common": "^1.0.2",
     "@endo/compartment-mapper": "^1.1.0",
+    "@endo/captp": "^4.0.2",
     "@endo/far": "^1.0.2",
     "@endo/init": "^1.0.2",
     "@endo/marshal": "^1.1.0",

packages/agoric-cli/src/commands/inter.js

@@ -5,11 +5,10 @@
 
 // @ts-check
 import { CommanderError, InvalidArgumentError } from 'commander';
-// TODO: should get M from endo https://github.com/Agoric/agoric-sdk/issues/7090
+import { objectMap } from '@endo/common/object-map.js';
+import { M, matches } from '@endo/patterns';
 import { makeOfferSpecShape } from '@agoric/inter-protocol/src/auction/auctionBook.js';
 import { Offers } from '@agoric/inter-protocol/src/clientSupport.js';
-import { objectMap } from '@agoric/internal';
-import { M, matches } from '@agoric/store';
 
 import { normalizeAddressWithOptions, pollBlocks } from '../lib/chain.js';
 import {

packages/agoric-cli/src/sdk-package-names.js

@@ -25,7 +25,6 @@ export default [
   "@agoric/network",
   "@agoric/notifier",
   "@agoric/pegasus",
-  "@agoric/same-structure",
   "@agoric/smart-wallet",
   "@agoric/solo",
   "@agoric/sparse-ints",

packages/assert/src/types.js

@@ -26,7 +26,7 @@
 /**
  * @callback AssertMakeError
  *
- * The `assert.error` method, recording details for the console.
+ * The `makeError` function, recording details for the console.
  *
  * The optional `optDetails` can be a string.
  * @param {Details} [optDetails] The details of what was asserted
@@ -154,7 +154,7 @@
 
 /**
  * @callback AssertNote
- * The `assert.note` method.
+ * The `errorNote` function.
  *
  * Annotate an error with details, potentially to be used by an
  * augmented console such as the causal console of `console.js`, to
@@ -345,6 +345,7 @@
  *   details: DetailsTag,
  *   Fail: FailTag,
  *   quote: AssertQuote,
+ *   bare: AssertQuote,
  *   makeAssert: MakeAssert,
  * } } Assert
  */

packages/base-zone/package.json

@@ -27,6 +27,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@agoric/store": "^0.9.2",
+    "@endo/errors": "^1.0.2",
     "@endo/exo": "^1.1.0",
     "@endo/far": "^1.0.2",
     "@endo/pass-style": "^1.1.0",

packages/base-zone/src/make-once.js

@@ -1,5 +1,5 @@
 // @ts-check
-const { Fail } = assert;
+import { throwRedacted as Fail } from '@endo/errors';
 
 /** @param {string} label */
 const defaultLabelToKeys = label => harden([label]);

packages/boot/package.json

@@ -39,6 +39,7 @@
     "@endo/eventual-send": "^1.1.0",
     "@endo/init": "^1.0.2",
     "@endo/far": "^1.0.2",
+    "@endo/patterns": "^1.1.0",
     "@endo/promise-kit": "^1.0.2",
     "@endo/stream": "^1.0.2",
     "import-meta-resolve": "^2.2.1"