fix: set the simpleExchange notifier's initial order book state

Agoric · Jul 11, 2020 · 70c17fd · 70c17fd
1 parent 39275c2
commit 70c17fd
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 5 deletions.
diff --git a/packages/zoe/src/contracts/simpleExchange.js b/packages/zoe/src/contracts/simpleExchange.js
@@ -29,7 +29,8 @@ import { makeZoeHelpers, defaultAcceptanceMsg } from '../contractSupport';
 const makeContract = zcf => {
   let sellOfferHandles = [];
   let buyOfferHandles = [];
-  const { notifier, updater } = produceNotifier();
+  // eslint-disable-next-line no-use-before-define
+  const { notifier, updater } = produceNotifier(getBookOrders());
 
   const {
     rejectOffer,

diff --git a/packages/zoe/test/swingsetTests/zoe/test-zoe.js b/packages/zoe/test/swingsetTests/zoe/test-zoe.js
@@ -202,7 +202,7 @@ test('zoe - simpleExchange - valid inputs', async t => {
 
 const expectedSimpleExchangeNotificationLog = [
   '=> alice, bob, carol and dave are set up',
-  '',
+  '{"buys":[],"sells":[]}',
   '{"buys":[],"sells":[{"want":{"Price":{"brand":{},"extent":4}},"give":{"Asset":{"brand":{},"extent":3}}}]}',
   'The offer has been accepted. Once the contract has been completed, please check your payout',
   '{"buys":[],"sells":[]}',

diff --git a/packages/zoe/test/unitTests/contracts/test-simpleExchange.js b/packages/zoe/test/unitTests/contracts/test-simpleExchange.js
@@ -15,7 +15,7 @@ import { makeGetInstanceHandle } from '../../../src/clientSupport';
 const simpleExchange = `${__dirname}/../../../src/contracts/simpleExchange`;
 
 test('simpleExchange with valid offers', async t => {
-  t.plan(14);
+  t.plan(17);
   const {
     moolaIssuer,
     simoleanIssuer,
@@ -52,6 +52,13 @@ test('simpleExchange with valid offers', async t => {
     Price: simoleanIssuer,
   });
 
+  const initialOrders = publicAPI.getNotifier().getCurrentUpdate().value;
+  t.deepEquals(
+    initialOrders,
+    { buys: [], sells: [] },
+    `order notifier is initialized`,
+  );
+
   const aliceInvite = publicAPI.makeInvite();
 
   // 2: Alice escrows with zoe to create a sell order. She wants to
@@ -70,9 +77,24 @@ test('simpleExchange with valid offers', async t => {
     offerHandle: aliceOfferHandle,
   } = await zoe.offer(aliceInvite, aliceSellOrderProposal, alicePayments);
 
+  const afterAliceOrders = publicAPI.getNotifier().getCurrentUpdate().value;
+  t.deepEquals(
+    afterAliceOrders,
+    {
+      buys: [],
+      sells: [
+        {
+          want: aliceSellOrderProposal.want,
+          give: aliceSellOrderProposal.give,
+        },
+      ],
+    },
+    `order notifier is updated with Alices sell order`,
+  );
+
   aliceOfferHandle.then(handle => {
     const aliceNotifier = zoe.getOfferNotifier(handle);
-    const firstUpdate = aliceNotifier.getUpdateSince();
+    const firstUpdate = aliceNotifier.getCurrentUpdate();
     t.notOk(firstUpdate.value, 'notifier start state is empty');
     t.notOk(firstUpdate.done, 'notifier start state is not done');
     t.ok(firstUpdate.updateHandle, 'notifier start state has handle');
@@ -123,6 +145,13 @@ test('simpleExchange with valid offers', async t => {
     bobPayments,
   );
 
+  const afterBobOrders = publicAPI.getNotifier().getCurrentUpdate().value;
+  t.deepEquals(
+    afterBobOrders,
+    { buys: [], sells: [] },
+    `order notifier is updated when Bob fulfills the order`,
+  );
+
   t.equals(
     await bobOutcomeP,
     'The offer has been accepted. Once the contract has been completed, please check your payout',
@@ -259,7 +288,7 @@ test('simpleExchange with multiple sell offers', async t => {
         ],
       };
       t.deepEquals(
-        publicAPI.getNotifier().getUpdateSince().value,
+        publicAPI.getNotifier().getCurrentUpdate().value,
         expectedBook,
       );
     });