chore: integrate with renaming of calcSwapInPrices/calcSwapOutPrices

Agoric · Sep 30, 2021 · 4584a65 · 4584a65
1 parent 29ff794
commit 4584a65
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/packages/zoe/src/contracts/vpool-xyk-amm/doublePool.js b/packages/zoe/src/contracts/vpool-xyk-amm/doublePool.js
@@ -5,8 +5,8 @@ import { AmountMath } from '@agoric/ertp';
 import { assert, details as X } from '@agoric/assert';
 import { makeFeeRatio } from '../constantProduct/calcFees';
 import {
-  calcSwapInPrices,
-  calcSwapOutPrices,
+  pricesForStatedInput,
+  pricesForStatedOutput,
 } from '../constantProduct/calcSwapPrices.js';
 
 // Price calculations and swap using a pair of pools. Both pools map between RUN
@@ -85,21 +85,21 @@ export const makeDoublePool = (
     //  less.
     // Notice that in the second call, the original amountOut is used, and in
     // the third call, the original amountIn is used.
-    const interimInpoolPrices = calcSwapInPrices(
+    const interimInpoolPrices = pricesForStatedInput(
       amountIn,
       inAllocation,
       emptyCentralAmount,
       protocolFeeRatio,
       centralFeeRatio,
     );
-    const outPoolPrices = calcSwapInPrices(
+    const outPoolPrices = pricesForStatedInput(
       interimInpoolPrices.swapperGets,
       outAllocation,
       amountOut,
       protocolFeeRatio,
       makeFeeRatio(poolFee, amountOut.brand),
     );
-    const finalInPoolPrices = calcSwapOutPrices(
+    const finalInPoolPrices = pricesForStatedOutput(
       amountIn,
       inAllocation,
       outPoolPrices.swapperGives,
@@ -142,21 +142,21 @@ export const makeDoublePool = (
     // Notice that the amountIn parameter to the first call to swapOutPrice
     // specifies an empty amount. This is interpreted as "no limit", which is
     // necessary since we can't guess a reasonable maximum of the central token.
-    const interimOutpoolPrices = calcSwapOutPrices(
+    const interimOutpoolPrices = pricesForStatedOutput(
       emptyCentralAmount,
       outAllocation,
       amountOut,
       protocolFeeRatio,
       centralFeeRatio,
     );
-    const inpoolPrices = calcSwapOutPrices(
+    const inpoolPrices = pricesForStatedOutput(
       amountIn,
       inAllocation,
       interimOutpoolPrices.swapperGets,
       protocolFeeRatio,
       makeFeeRatio(poolFee, amountIn.brand),
     );
-    const finalOutpoolPrices = calcSwapInPrices(
+    const finalOutpoolPrices = pricesForStatedInput(
       inpoolPrices.swapperGives,
       outAllocation,
       amountOut,

diff --git a/packages/zoe/src/contracts/vpool-xyk-amm/singlePool.js b/packages/zoe/src/contracts/vpool-xyk-amm/singlePool.js
@@ -3,8 +3,8 @@
 import { Far } from '@agoric/marshal';
 import { makeFeeRatio } from '../constantProduct/calcFees';
 import {
-  calcSwapInPrices,
-  calcSwapOutPrices,
+  pricesForStatedInput,
+  pricesForStatedOutput,
 } from '../constantProduct/calcSwapPrices.js';
 
 /**
@@ -48,7 +48,7 @@ export const makeSinglePool = (zcf, pool, protocolFee, poolFee, feeSeat) => {
   };
 
   const getPriceForInput = (amountIn, amountOut) => {
-    return calcSwapInPrices(
+    return pricesForStatedInput(
       amountIn,
       getPools(),
       amountOut,
@@ -63,7 +63,7 @@ export const makeSinglePool = (zcf, pool, protocolFee, poolFee, feeSeat) => {
   };
 
   const getPriceForOutput = (amountIn, amountOut) => {
-    return calcSwapOutPrices(
+    return pricesForStatedOutput(
       amountIn,
       getPools(),
       amountOut,