refactor: Use new M.splitArray and M.splitRecord

packages/ERTP/src/typeGuards.js

@@ -124,18 +124,19 @@ export const MAX_ABSOLUTE_DECIMAL_PLACES = 100;
 
 export const AssetKindShape = M.or('nat', 'set', 'copySet', 'copyBag');
 
-export const DisplayInfoShape = M.partial(
-  harden({
+export const DisplayInfoShape = M.splitRecord(
+  {},
+  {
     decimalPlaces: M.and(
       M.gte(-MAX_ABSOLUTE_DECIMAL_PLACES),
       M.lte(MAX_ABSOLUTE_DECIMAL_PLACES),
     ),
     assetKind: AssetKindShape,
-  }),
-  harden({
+  },
+  {
     // Including this empty `rest` ensures that there are no other
     // properties beyond those in the `base` record.
-  }),
+  },
 );
 
 // //////////////////////// Interfaces /////////////////////////////////////////

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

@@ -33,7 +33,7 @@ test('makeIssuerKit bad displayInfo.decimalPlaces', async t => {
       ),
     {
       message:
-        'displayInfo: optional-parts: decimalPlaces: "hello" - Must be >= -100',
+        'displayInfo: optional: decimalPlaces: "hello" - Must be >= -100',
     },
   );
 
@@ -61,17 +61,15 @@ test('makeIssuerKit bad displayInfo.decimalPlaces', async t => {
     () =>
       makeIssuerKit('myTokens', AssetKind.NAT, harden({ decimalPlaces: 101 })),
     {
-      message:
-        'displayInfo: optional-parts: decimalPlaces: 101 - Must be <= 100',
+      message: 'displayInfo: optional: decimalPlaces: 101 - Must be <= 100',
     },
   );
 
   t.throws(
     () =>
       makeIssuerKit('myTokens', AssetKind.NAT, harden({ decimalPlaces: -101 })),
     {
-      message:
-        'displayInfo: optional-parts: decimalPlaces: -101 - Must be >= -100',
+      message: 'displayInfo: optional: decimalPlaces: -101 - Must be >= -100',
     },
   );
 });
@@ -89,7 +87,7 @@ test('makeIssuerKit bad displayInfo.assetKind', async t => {
       ),
     {
       message:
-        'displayInfo: optional-parts: assetKind: "something" - Must match one of ["nat","set","copySet","copyBag"]',
+        'displayInfo: optional: assetKind: "something" - Must match one of ["nat","set","copySet","copyBag"]',
     },
   );
 });
@@ -106,8 +104,7 @@ test('makeIssuerKit bad displayInfo.whatever', async t => {
         }),
       ),
     {
-      message:
-        'displayInfo: rest-parts: {"whatever":"something"} - Must be: {}',
+      message: 'displayInfo: rest: {"whatever":"something"} - Must be: {}',
     },
   );
 });
@@ -144,7 +141,7 @@ test('brand.isMyIssuer bad issuer', async t => {
   // @ts-expect-error Intentional wrong type for testing
   t.throwsAsync(() => brand.isMyIssuer('not an issuer'), {
     message:
-      'In "isMyIssuer" method of (myTokens brand) arg 0: string "not an issuer" - Must be a remotable (Issuer)',
+      'In "isMyIssuer" method of (myTokens brand): args: [0]: string "not an issuer" - Must be a remotable (Issuer)',
   });
   const fakeIssuer = /** @type {Issuer} */ (
     /** @type {unknown} */ (Far('myTokens issuer', {}))
@@ -187,7 +184,7 @@ test('issuer.combine bad payments array', async t => {
   // @ts-expect-error Intentional wrong type for testing
   await t.throwsAsync(() => E(issuer).combine(notAnArray), {
     message:
-      'In "combine" method of (fungible issuer) arg 0: cannot serialize Remotables with non-methods like "length" in {"length":2,"split":"[Function split]"}',
+      'In "combine" method of (fungible issuer): cannot serialize Remotables with non-methods like "length" in {"length":2,"split":"[Function split]"}',
   });
 
   const notAnArray2 = Far('notAnArray2', {
@@ -197,7 +194,7 @@ test('issuer.combine bad payments array', async t => {
   // @ts-expect-error Intentional wrong type for testing
   await t.throwsAsync(() => E(issuer).combine(notAnArray2), {
     message:
-      'In "combine" method of (fungible issuer) arg 0: remotable "[Alleged: notAnArray2]" - Must be a copyArray',
+      'In "combine" method of (fungible issuer): args: [0]: remotable "[Alleged: notAnArray2]" - Must be a copyArray',
   });
 });
 

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

@@ -43,7 +43,7 @@ test('bad display info', t => {
   const displayInfo = harden({ somethingUnexpected: 3 });
   // @ts-expect-error deliberate invalid arguments for testing
   t.throws(() => makeIssuerKit('fungible', AssetKind.NAT, displayInfo), {
-    message: 'displayInfo: rest-parts: {"somethingUnexpected":3} - Must be: {}',
+    message: 'displayInfo: rest: {"somethingUnexpected":3} - Must be: {}',
   });
 });
 
@@ -199,7 +199,7 @@ test('purse.deposit promise', async t => {
     () => E(purse).deposit(exclusivePaymentP, fungible25),
     {
       message:
-        'In "deposit" method of (fungible Purse purse) arg 0: promise "[Promise]" - Must be a remotable (Payment)',
+        'In "deposit" method of (fungible Purse purse): args: [0]: promise "[Promise]" - Must be a remotable (Payment)',
     },
     'failed to reject a promise for a payment',
   );
@@ -334,7 +334,7 @@ test('issuer.split bad amount', async t => {
     _ => E(issuer).split(payment, AmountMath.make(otherBrand, 10n)),
     {
       message:
-        'In "split" method of (fungible issuer) arg 1: brand: "[Alleged: other fungible brand]" - Must be: "[Alleged: fungible brand]"',
+        'In "split" method of (fungible issuer): args: [1]: brand: "[Alleged: other fungible brand]" - Must be: "[Alleged: fungible brand]"',
     },
     'throws for bad amount',
   );

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

@@ -45,7 +45,7 @@ test('mint.mintPayment set w strings AssetKind', async t => {
   const badAmount = AmountMath.make(brand, harden([['badElement']]));
   t.throws(() => mint.mintPayment(badAmount), {
     message:
-      'In "mintPayment" method of (items mint) arg 0: value: [0]: copyArray ["badElement"] - Must be a string',
+      'In "mintPayment" method of (items mint): args: [0]: value: [0]: copyArray ["badElement"] - Must be a string',
   });
 });
 

packages/SwingSet/src/typeGuards.js

@@ -3,16 +3,17 @@ import { M } from '@agoric/store';
 
 export const ManagerType = M.or('xs-worker', 'local'); // TODO: others
 
-const Bundle = M.split({ moduleType: M.string() }, M.partial({}));
+const Bundle = M.splitRecord({ moduleType: M.string() });
+
+const partial1 = harden({
+  creationOptions: M.splitRecord({}, { critial: M.boolean() }),
+  parameters: M.recordOf(M.string(), M.any()),
+});
 
-const p1 = M.and(
-  M.partial({ creationOptions: M.partial({ critial: M.boolean() }) }),
-  M.partial({ parameters: M.recordOf(M.string(), M.any()) }),
-);
 const SwingSetConfigProperties = M.or(
-  M.split({ sourceSpec: M.string() }, p1),
-  M.split({ bundleSpec: M.string() }, p1),
-  M.split({ bundle: Bundle }, p1),
+  M.splitRecord({ sourceSpec: M.string() }, partial1),
+  M.splitRecord({ bundleSpec: M.string() }, partial1),
+  M.splitRecord({ bundle: Bundle }, partial1),
 );
 const SwingSetConfigDescriptor = M.recordOf(
   M.string(),
@@ -30,11 +31,11 @@ const SwingSetConfigDescriptor = M.recordOf(
  * in ./types-external.js
  */
 export const SwingSetConfig = M.and(
-  M.partial({ defaultManagerType: ManagerType }),
-  M.partial({ includeDevDependencies: M.boolean() }),
-  M.partial({ defaultReapInterval: M.number() }), // not in type decl
-  M.partial({ snapshotInterval: M.number() }),
-  M.partial({ vats: SwingSetConfigDescriptor }),
-  M.partial({ bootstrap: M.string() }),
-  M.partial({ bundles: SwingSetConfigDescriptor }),
+  M.splitRecord({}, { defaultManagerType: ManagerType }),
+  M.splitRecord({}, { includeDevDependencies: M.boolean() }),
+  M.splitRecord({}, { defaultReapInterval: M.number() }), // not in type decl
+  M.splitRecord({}, { snapshotInterval: M.number() }),
+  M.splitRecord({}, { vats: SwingSetConfigDescriptor }),
+  M.splitRecord({}, { bootstrap: M.string() }),
+  M.splitRecord({}, { bundles: SwingSetConfigDescriptor }),
 );

packages/casting/src/netconfig.js

@@ -14,12 +14,12 @@ import { fit, M } from '@agoric/store';
  * @property {string[]} [peers] - a list of nodes used to start the p2p gossip (stored in a per-node “address book”, which is a file stored in that node’s data directory)
  * @property {string[]} [seeds] - nodes which tell you about other peers but don't gossip actual data
  */
-export const NetworkConfigShape = M.split(
-  {
+export const NetworkConfigShape = M.splitRecord(
+  harden({
     chainName: M.string(),
     rpcAddrs: M.arrayOf(M.string()),
-  },
-  M.partial({
+  }),
+  harden({
     apiAddrs: M.arrayOf(M.string()),
     gci: M.string(),
     peers: M.arrayOf(M.string()),

packages/governance/test/unitTests/test-paramGovernance.js

@@ -218,7 +218,7 @@ test('multiple params bad change', async t => {
       ),
     {
       message:
-        'In "getAmountOf" method of (Zoe Invitation issuer) arg 0: bigint "[13n]" - Must be a remotable (Payment)',
+        'In "getAmountOf" method of (Zoe Invitation issuer): args: [0]: bigint "[13n]" - Must be a remotable (Payment)',
     },
   );
 });

packages/inter-protocol/src/psm/psm.js

@@ -276,7 +276,7 @@ export const start = async (zcf, privateArgs, baggage) => {
         wantmintedHook,
         'wantMinted',
         undefined,
-        M.split({
+        M.splitRecord({
           give: { In: anchorAmountShape },
           want: M.or({ Out: stableAmountShape }, {}),
         }),
@@ -287,7 +287,7 @@ export const start = async (zcf, privateArgs, baggage) => {
         giveMintedHook,
         'giveMinted',
         undefined,
-        M.split({
+        M.splitRecord({
           give: { In: stableAmountShape },
           want: M.or({ Out: anchorAmountShape }, {}),
         }),

packages/inter-protocol/src/psm/psmCharter.js

@@ -23,17 +23,15 @@ import { E } from '@endo/far';
  * @property {Record<string, unknown>} params
  * @property {{paramPath: { key: string }}} [path]
  */
-const ParamChangesOfferArgsShape = harden(
-  M.split(
-    {
-      deadline: TimestampShape,
-      instance: InstanceHandleShape,
-      params: M.recordOf(M.string(), M.any()),
-    },
-    M.partial({
-      path: { paramPath: { key: M.string() } },
-    }),
-  ),
+const ParamChangesOfferArgsShape = M.splitRecord(
+  {
+    deadline: TimestampShape,
+    instance: InstanceHandleShape,
+    params: M.recordOf(M.string(), M.any()),
+  },
+  {
+    path: { paramPath: { key: M.string() } },
+  },
 );
 
 /**

packages/inter-protocol/src/vaultFactory/params.js

@@ -78,16 +78,13 @@ const makeVaultParamManager = (publisherKit, initial) =>
   });
 /** @typedef {ReturnType<typeof makeVaultParamManager>} VaultParamManager */
 
-export const vaultParamPattern = M.split(
-  {
-    liquidationMargin: ratioPattern,
-    liquidationPenalty: ratioPattern,
-    interestRate: ratioPattern,
-    loanFee: ratioPattern,
-    debtLimit: amountPattern,
-  },
-  M.any(),
-);
+export const vaultParamPattern = M.splitRecord({
+  liquidationMargin: ratioPattern,
+  liquidationPenalty: ratioPattern,
+  interestRate: ratioPattern,
+  loanFee: ratioPattern,
+  debtLimit: amountPattern,
+});
 
 /**
  * @param {import('@agoric/notifier').StoredPublisherKit<GovernanceSubscriptionState>} publisherKit

packages/inter-protocol/test/psm/test-psm.js

@@ -622,7 +622,7 @@ test('wrong give giveMintedInvitation', async t => {
       ),
     {
       message:
-        '"giveMinted" proposal: required-parts: give: In: brand: "[Alleged: aUSD brand]" - Must be: "[Alleged: IST brand]"',
+        '"giveMinted" proposal: give: In: brand: "[Alleged: aUSD brand]" - Must be: "[Alleged: IST brand]"',
     },
   );
 });
@@ -652,7 +652,7 @@ test('wrong give wantMintedInvitation', async t => {
       ),
     {
       message:
-        '"wantMinted" proposal: required-parts: give: In: brand: "[Alleged: IST brand]" - Must be: "[Alleged: aUSD brand]"',
+        '"wantMinted" proposal: give: In: brand: "[Alleged: IST brand]" - Must be: "[Alleged: aUSD brand]"',
     },
   );
 });
@@ -674,7 +674,7 @@ test('extra give wantMintedInvitation', async t => {
       ),
     {
       message:
-        '"wantMinted" proposal: required-parts: give: {"Extra":{"brand":"[Alleged: aUSD brand]","value":"[200000000n]"},"In":{"brand":"[Seen]","value":"[200000000n]"}} - Must not have unexpected properties: ["Extra"]',
+        '"wantMinted" proposal: give: {"Extra":{"brand":"[Alleged: aUSD brand]","value":"[200000000n]"},"In":{"brand":"[Seen]","value":"[200000000n]"}} - Must not have unexpected properties: ["Extra"]',
     },
   );
 });

packages/inter-protocol/test/vaultFactory/test-vaultFactory.js

@@ -2516,7 +2516,7 @@ test('addVaultType: extra, unexpected params', async t => {
     E(vaultFactory).addVaultType(chit.issuer, 'Chit', missingParams),
     {
       message:
-        /initialParamValues: required-parts: .* - Must have missing properties \["interestRate"\]/,
+        /initialParamValues: .* - Must have missing properties \["interestRate"\]/,
     },
   );
 

packages/internal/src/utils.js

@@ -11,16 +11,16 @@ const { details: X, quote: q } = assert;
 
 /**
  * Throws if multiple entries use the same property name. Otherwise acts
- * like `Object.fromEntries`. Use it to protect from property names
- * computed from user-provided data.
+ * like `Object.fromEntries` but hardens the result.
+ * Use it to protect from property names computed from user-provided data.
  *
  * @template K,V
  * @param {Iterable<[K,V]>} allEntries
  * @returns {{[k: K]: V}}
  */
 export const fromUniqueEntries = allEntries => {
   const entriesArray = [...allEntries];
-  const result = fromEntries(entriesArray);
+  const result = harden(fromEntries(entriesArray));
   if (ownKeys(result).length === entriesArray.length) {
     return result;
   }

packages/smart-wallet/src/typeGuards.js

@@ -12,25 +12,25 @@ export const shape = {
   },
 
   // invitations
-  ContractInvitationSpec: M.split(
+  ContractInvitationSpec: M.splitRecord(
     {
       source: 'contract',
       instance: InstanceHandleShape,
       publicInvitationMaker: M.string(),
     },
-    M.partial({
+    {
       invitationArgs: M.array(),
-    }),
+    },
   ),
-  ContinuingInvitationSpec: M.split(
+  ContinuingInvitationSpec: M.splitRecord(
     {
       source: 'continuing',
       previousOffer: M.or(M.number(), M.string()),
       invitationMakerName: M.string(),
     },
-    M.partial({
+    {
       invitationArgs: M.array(),
-    }),
+    },
   ),
   PurseInvitationSpec: {
     source: 'purse',
@@ -39,24 +39,25 @@ export const shape = {
   },
 
   // offers
-  OfferSpec: M.split(
+  OfferSpec: M.splitRecord(
     {
       id: M.or(M.number(), M.string()),
       // TODO M.unknown() to defer validation
       invitationSpec: M.any(),
       proposal: ProposalShape,
     },
-    M.partial({ offerArgs: M.any() }),
+    { offerArgs: M.any() },
   ),
 
   // walletFactory
-  WalletBridgeMsg: M.split(
+  WalletBridgeMsg: M.splitRecord(
     {
       owner: M.string(),
       type: M.string(),
       blockHeight: M.number(),
       blockTime: M.number(),
     },
+    {},
     M.or({ action: M.string() }, { spendAction: M.string() }),
   ),
 };