#45 fix failing tests, update README.md typo

Jorge-Lopes · Apr 13, 2023 · d516a70 · d516a70
1 parent 3c5006e
commit d516a70
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Please make sure you install the agoric-sdk first.
    > Due to some problem related to ava setup we can only run test when we're in the contract/ directory.
    > So you should cd to contract/ directory until this issue is resolved.
    1. `cd contract`
-   2. Run `npx ava --verbose test/lendingPool/test-stopLoss.js`.
+   2. Run `npx ava -s -v test/test-stopLoss.js`.
 
 
 # Demonstration scenarios

diff --git a/contract/package.json b/contract/package.json
@@ -23,7 +23,7 @@
     "@endo/far": "^0.2.9",
     "@endo/nat": "^4.1.18",
     "@endo/promise-kit": "^0.2.47",
-    "@agoric/inter-protocol": "0.11.0"
+    "@agoric/inter-protocol": "0.13.3"
   },
   "devDependencies": {
     "@agoric/deploy-script-support": "^0.9.0",

diff --git a/contract/src/stopLoss.js b/contract/src/stopLoss.js
@@ -4,10 +4,10 @@ import {
   assertIssuerKeywords,
   assertProposalShape,
   getAmountOut,
-} from '@agoric/zoe/src/contractSupport';
+  offerTo,
+} from '@agoric/zoe/src/contractSupport/index.js';
 import { Far, E } from '@endo/far';
 import { AmountMath } from '@agoric/ertp';
-import { offerTo } from '@agoric/zoe/src/contractSupport/index.js';
 import {
   assertBoundaryShape,
   assertExecutionMode,

diff --git a/contract/test/helper.js b/contract/test/helper.js
@@ -232,8 +232,9 @@ export const makeAssertPayouts = (
   };
 };
 
-export async function startStopLoss(zoe, issuerKeywordRecord, terms) {
+export async function startStopLoss(t, zoe, issuerKeywordRecord, terms) {
   const { publicFacet, creatorFacet } = await setupStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,

diff --git a/contract/test/setup.js b/contract/test/setup.js
@@ -121,15 +121,15 @@ harden(setupAmmServices);
 
 
 export const setupStopLoss = async (
+  t,
   zoe,
   issuerKeywordRecord,
   terms,
-
 ) => {
 
-  const contractPath = new URL(contractRoots.stopLossRoot, import.meta.url).pathname;
-  const bundle = await bundleSource(contractPath);
-  const installation = await E(zoe).install(bundle);
+  const stopLossUrl = await importMetaResolve(contractRoots.stopLossRoot, import.meta.url);
+  const stopLossBundle = await provideBundle(t, new URL(stopLossUrl).pathname, 'stopLoss');
+  const installation = await E(zoe).install(stopLossBundle);
 
   const { publicFacet, creatorFacet  } = await E(zoe).startInstance(
     installation,

diff --git a/contract/test/test-stopLoss.js b/contract/test/test-stopLoss.js
@@ -119,6 +119,7 @@ test('lock-lpTokens', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -219,6 +220,7 @@ test('lock-additional-lpTokens', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -360,6 +362,7 @@ test('withdraw-locked-LpTokens ', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -489,6 +492,7 @@ test('withdraw-liquidity', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -621,6 +625,7 @@ test('trigger-lp-removal-price-moves-above-upper', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -752,6 +757,7 @@ test('trigger-lp-removal-price-moves-below-lower', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -883,6 +889,7 @@ test('update-boundaries-price-moves-below-old-lower-boundary', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -1031,6 +1038,7 @@ test('update-boundaries-price-moves-above-old-upper-boundary', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -1180,6 +1188,7 @@ test('update-boundaries-price-moves-above-old-upper-then-new-upper', async (t) =
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -1368,6 +1377,7 @@ test('update-boundaries-price-moves-below-old-lower-then-new-lower', async (t) =
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -1556,6 +1566,7 @@ test('update-boundaries-price-moves-below-old-lower-then-new-upper', async (t) =
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -1748,6 +1759,7 @@ test('boundaryWatcher-failed-no-tokens-locked', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -1860,6 +1872,7 @@ test('boundaryWatcher-failed-then-remove-tokens-locked', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -2016,6 +2029,7 @@ test('update-boundaries-outside-of-price-ratio', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -2184,6 +2198,7 @@ test('initiate-stoploss-with-boundaries-outside-of-price-ratio', async (t) => {
   });
 
   const testingPromise = startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,
@@ -2265,6 +2280,7 @@ test('remove-liquidity-failed-keep-tokens-locked', async (t) => {
   });
 
   const { creatorFacet, publicFacet } = await startStopLoss(
+    t,
     zoe,
     issuerKeywordRecord,
     terms,