Merge pull request Agoric#22 from Agoric/noodle

Remove corkboardAssay concept + trivial name cleanups

core/assays.js

@@ -166,11 +166,11 @@ Unrecognized amount: ${amount}`;
         return amount;
       },
 
-      coerce(allegedMetaAmount) {
-        if (brand.has(allegedMetaAmount)) {
-          return allegedMetaAmount;
+      coerce(allegedAmount) {
+        if (brand.has(allegedAmount)) {
+          return allegedAmount;
         }
-        const { label: allegedLabel, quantity } = allegedMetaAmount;
+        const { label: allegedLabel, quantity } = allegedAmount;
         mustBeSameStructure(label, allegedLabel, 'Unrecognized label');
         return assay.make(quantity);
       },

core/contractHost.js

@@ -42,7 +42,7 @@ No invites left`;
     const desc = inviteAssay.quantity(inviteAmount);
     const { seatIdentity } = desc;
     return E.resolve(
-      inviteIssuer.slash(inviteAmount, allegedInvitePayment),
+      inviteIssuer.burn(inviteAmount, allegedInvitePayment),
     ).then(_ => seats.get(seatIdentity));
   }
 

core/issuers.js

@@ -70,14 +70,14 @@ Description must be truthy: ${description}`;
       );
     },
 
-    slash(amount, srcPaymentP) {
+    burn(amount, srcPaymentP) {
       // We deposit the alleged payment, rather than just doing a get
       // exclusive on it, in order to consume the usage erights as well.
       const sinkPurse = issuer.makeEmptyPurse('sink purse');
       return sinkPurse.deposit(amount, srcPaymentP);
     },
 
-    slashAll(srcPaymentP) {
+    burnAll(srcPaymentP) {
       const sinkPurse = issuer.makeEmptyPurse('sink purse');
       return sinkPurse.depositAll(srcPaymentP);
     },
@@ -235,7 +235,7 @@ function makePeg(
 
       redeemAll(localPayment, name = 'redeemed') {
         return localIssuer
-          .slashAll(localPayment)
+          .burnAll(localPayment)
           .then(localAmount =>
             E(backingPurseP).withdraw(remoteAmountOf(localAmount), name),
           );

demo/handoff/bootstrap.js

@@ -2,52 +2,10 @@
 
 import harden from '@agoric/harden';
 
-import { makeCorkboardAssayMaker } from '../../more/handoff/corkboardAssay';
 import { makeCorkboard } from '../../more/handoff/corkboard';
-import { sameStructure } from '../../util/sameStructure';
 import { makeHandoffService } from '../../more/handoff/handoff';
 
 function build(E, log) {
-  function testCorkboardAssay() {
-    log('starting testCorkboardAssay');
-    const corkboardAssayMaker = makeCorkboardAssayMaker();
-    const assay = corkboardAssayMaker('foo');
-    if (assay.getLabel() !== 'foo') {
-      log('assay label should be "foo"');
-    }
-    if (assay.empty('corkboard') !== assay.empty('another corkboard')) {
-      log('corkboards not equal');
-    }
-
-    const fakeChannel = makeCorkboard('something');
-    const amount = assay.make(fakeChannel);
-    if (!assay.vouch(amount)) {
-      log('assay should vouch for actual amount');
-    }
-    if (assay.coerce(amount) !== amount) {
-      log('assay should coerce to itself');
-    }
-    const allegedAmount = { label: 'foo', quantity: fakeChannel };
-    if (!sameStructure(assay.coerce(allegedAmount.quantity), amount)) {
-      log(
-        `literal assay (${
-          allegedAmount.quantity
-        } should coerce to equivalent ${amount}`,
-      );
-    }
-  }
-
-  function testCorkboardAssayQuantities() {
-    log('starting testCorkboardAssayQuantities');
-    const corkboardAssayMaker = makeCorkboardAssayMaker();
-    const assay = corkboardAssayMaker('foo');
-    const fakeChannel = makeCorkboard('bar');
-    const amount = assay.make(fakeChannel);
-    if (amount !== fakeChannel) {
-      log('amount quantity should be label: "bar".');
-    }
-  }
-
   function testCorkboardStorage() {
     log('starting testCorkboardStorage');
     const bb = makeCorkboard('whiteboard');
@@ -124,9 +82,6 @@ function build(E, log) {
   const obj0 = {
     async bootstrap(argv, vats) {
       switch (argv[0]) {
-        case 'corkboardAssay': {
-          return testCorkboardAssay() + testCorkboardAssayQuantities();
-        }
         case 'corkboard': {
           return testCorkboardStorage();
         }

more/handoff/handoff.js

@@ -2,15 +2,13 @@
 
 import harden from '@agoric/harden';
 
-import { makeCorkboardAssayMaker } from './corkboardAssay';
 import { makeCorkboard } from './corkboard';
+import { insist } from '../../util/insist';
 
 function makeHandoffService() {
   // I'd have used PrivateNames, but they want objects (not Strings) as Keys.
   const boards = new Map();
-
-  const corkboardAssayMaker = makeCorkboardAssayMaker();
-  const corkboardAssay = corkboardAssayMaker('root');
+  const brand = new WeakSet();
 
   const handoffService = harden({
     // retrieve and remove from the map.
@@ -29,11 +27,13 @@ function makeHandoffService() {
       }
       const corkBoard = makeCorkboard(preferredName);
       boards.set(preferredName, corkBoard);
-      corkboardAssay.make(corkBoard);
+      brand.add(corkBoard);
       return corkBoard;
     },
     validate(allegedBoard) {
-      return corkboardAssay.vouch(allegedBoard);
+      insist(brand.has(allegedBoard))`\
+Unrecognized board: ${allegedBoard}`;
+      return allegedBoard;
     },
     // We don't need remove, since grab can be used for that.
   });

test/demo/test-demos.js

@@ -172,24 +172,6 @@ test('run contractHost Demo --covered-call-sale without SES', async t => {
   t.end();
 });
 
-const corkboardAssaysGolden = [
-  '=> setup called',
-  'starting testCorkboardAssay',
-  'starting testCorkboardAssayQuantities',
-];
-
-test('run handoff Demo --corkboard assays', async t => {
-  const dump = await main(false, 'demo/handoff', ['corkboardAssay']);
-  t.deepEquals(dump.log, corkboardAssaysGolden);
-  t.end();
-});
-
-test('run handoff Demo --corkboard assays', async t => {
-  const dump = await main(true, 'demo/handoff', ['corkboardAssay']);
-  t.deepEquals(dump.log, corkboardAssaysGolden);
-  t.end();
-});
-
 const corkboardContentsGolden = [
   '=> setup called',
   'starting testCorkboardStorage',