Merge pull request Agoric#63 from Agoric/link-installations

link installations rather than concating code
dckc · Jun 1, 2019 · 0497ccf · 0497ccf
2 parents af655cb + f109d44
commit 0497ccf
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 19 deletions.
diff --git a/demo/contractHost/coveredCall.js b/demo/contractHost/coveredCall.js
@@ -3,18 +3,25 @@
 
 import harden from '@agoric/harden';
 
-import { escrowExchange } from './escrow';
-
 function coveredCall(terms, inviteMaker) {
-  const [moneyNeeded, stockNeeded, timerP, deadline] = terms;
-
-  const [aliceInvite, bobInvite] = escrowExchange(
-    [moneyNeeded, stockNeeded],
-    inviteMaker,
+  const [
+    escrowExchangeInstallationP,
+    moneyNeeded,
+    stockNeeded,
+    timerP,
+    deadline,
+  ] = terms;
+
+  const pairP = E(escrowExchangeInstallationP).spawn(
+    harden([moneyNeeded, stockNeeded]),
   );
 
-  const aliceEscrowSeatP = inviteMaker.redeem(aliceInvite);
-  const bobEscrowSeatP = inviteMaker.redeem(bobInvite);
+  const aliceEscrowSeatP = E.resolve(pairP).then(pair =>
+    inviteMaker.redeem(pair[0]),
+  );
+  const bobEscrowSeatP = E.resolve(pairP).then(pair =>
+    inviteMaker.redeem(pair[1]),
+  );
 
   // Seats
 
@@ -43,10 +50,6 @@ function coveredCall(terms, inviteMaker) {
   return inviteMaker.make('writer', bobSeat);
 }
 
-const coveredCallSrc = `\
-(function() {
-  ${escrowExchange}
-  return (${coveredCall});
-}())`;
+const coveredCallSrc = `(${coveredCall})`;
 
 export { coveredCall, coveredCallSrc };
diff --git a/demo/contractHost/vat-alice.js b/demo/contractHost/vat-alice.js
@@ -138,7 +138,13 @@ function makeAliceMaker(E, host, log) {
                   label: inviteIssuerLabel,
                   quantity: {
                     installation: coveredCallInstallationP,
-                    terms: [smackers10, yoyodyne7, timerP, 'singularity'],
+                    terms: [
+                      escrowExchangeInstallationP,
+                      smackers10,
+                      yoyodyne7,
+                      timerP,
+                      'singularity',
+                    ],
                     seatIdentity: allegedInviteAmount.quantity.seatIdentity,
                     seatDesc: 'holder',
                   },

diff --git a/demo/contractHost/vat-bob.js b/demo/contractHost/vat-bob.js
@@ -77,6 +77,7 @@ function makeBobMaker(E, host, log) {
         offerAliceOption(alice) {
           log('++ bob.offerAliceOption starting');
           const terms = harden([
+            escrowExchangeInstallationP,
             moneyNeededP,
             stockNeededP,
             timerP,

diff --git a/demo/contractHost/vat-fred.js b/demo/contractHost/vat-fred.js
@@ -66,7 +66,13 @@ function makeFredMaker(E, host, log) {
                 label: inviteIssuerLabel,
                 quantity: {
                   installation: coveredCallInstallationP,
-                  terms: [dough10, wonka7, timerP, 'singularity'],
+                  terms: [
+                    escrowExchangeInstallationP,
+                    dough10,
+                    wonka7,
+                    timerP,
+                    'singularity',
+                  ],
                   seatIdentity:
                     allegedOptionsInviteAmount.quantity.seatIdentity,
                   seatDesc: 'holder',

diff --git a/test/test-demos.js b/test/test-demos.js
@@ -156,8 +156,8 @@ const contractCoveredCallGolden = [
   '++ bob.offerAliceOption starting',
   '++ alice.acceptOptionDirectly starting',
   'Pretend singularity never happens',
-  'alice invite xfer balance {"label":{"issuer":{},"description":"contract host"},"quantity":{"installation":{},"terms":[{"label":{"issuer":{},"description":"smackers"},"quantity":10},{"label":{"issuer":{},"description":"yoyodyne"},"quantity":7},{},"singularity"],"seatIdentity":{},"seatDesc":"holder"}}',
-  'verified invite xfer balance {"label":{"issuer":{},"description":"contract host"},"quantity":{"installation":{},"terms":[{"label":{"issuer":{},"description":"smackers"},"quantity":10},{"label":{"issuer":{},"description":"yoyodyne"},"quantity":7},{},"singularity"],"seatIdentity":{},"seatDesc":"holder"}}',
+  'alice invite xfer balance {"label":{"issuer":{},"description":"contract host"},"quantity":{"installation":{},"terms":[{},{"label":{"issuer":{},"description":"smackers"},"quantity":10},{"label":{"issuer":{},"description":"yoyodyne"},"quantity":7},{},"singularity"],"seatIdentity":{},"seatDesc":"holder"}}',
+  'verified invite xfer balance {"label":{"issuer":{},"description":"contract host"},"quantity":{"installation":{},"terms":[{},{"label":{"issuer":{},"description":"smackers"},"quantity":10},{"label":{"issuer":{},"description":"yoyodyne"},"quantity":7},{},"singularity"],"seatIdentity":{},"seatDesc":"holder"}}',
   'alice option wins: {"label":{"issuer":{},"description":"yoyodyne"},"quantity":7} refs: null',
   'bob option wins: {"label":{"issuer":{},"description":"smackers"},"quantity":10} refs: null',
   '++ bob.offerAliceOption done',
@@ -193,7 +193,7 @@ const contractCoveredCallSaleGolden = [
   '++ fred.acceptOptionOffer starting',
   'Pretend singularity never happens',
   'alice options sale wins: {"label":{"issuer":{},"description":"fins"},"quantity":55} refs: null',
-  'fred buys escrowed option wins: {"label":{"issuer":{},"description":"contract host"},"quantity":{"installation":{},"terms":[{"label":{"issuer":{},"description":"dough"},"quantity":10},{"label":{"issuer":{},"description":"wonka"},"quantity":7},{},"singularity"],"seatIdentity":{},"seatDesc":"holder"}} refs: null',
+  'fred buys escrowed option wins: {"label":{"issuer":{},"description":"contract host"},"quantity":{"installation":{},"terms":[{},{"label":{"issuer":{},"description":"dough"},"quantity":10},{"label":{"issuer":{},"description":"wonka"},"quantity":7},{},"singularity"],"seatIdentity":{},"seatDesc":"holder"}} refs: null',
   'fred exercises option, buying stock wins: {"label":{"issuer":{},"description":"wonka"},"quantity":7} refs: null',
   'bob option wins: {"label":{"issuer":{},"description":"dough"},"quantity":10} refs: null',
   '++ alice.acceptOptionForFred done',