Skip to content

Commit

Permalink
checkpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
justinbarry committed Mar 8, 2021
1 parent 48c3df7 commit 15ae9a6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,8 @@ const ModalAddLiquidity = ({
properties.marketId,
cash,
onChainFee,
amount
amount,
amm.symbols
);
} else {
results = await estimateAddLiquidity(
Expand Down
9 changes: 7 additions & 2 deletions packages/augur-test/src/tests/amm/ammErc20.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ describe('AMM Middleware for ERC20', () => {
const INCLUDE_FEE = true;
const EXCLUDE_FEE = false;
const SYMBOL_ROOT = 'symbol';
const SYMBOLS = [
`i${SYMBOL_ROOT}`,
`n${SYMBOL_ROOT}`,
`y${SYMBOL_ROOT}`
];

function makeAMMMiddleware(user: TestContractAPI): AMM {
const wethParaShareTokenAddress = config?.paraDeploys[config.addresses.WETH9]?.addresses.ShareToken;
Expand Down Expand Up @@ -238,7 +243,7 @@ describe('AMM Middleware for ERC20', () => {
});

console.log('Selling 1/3rd of LP tokens via removeLiquidity, then selling the resulting shares');
await middleware.doRemoveLiquidity(market.address, usdtParaShare.address, fee, lpTokensToBurn, SYMBOL_ROOT);
await middleware.doRemoveLiquidity(market.address, usdtParaShare.address, fee, lpTokensToBurn, SYMBOLS);

const postInvalid = await usdtParaShare.balanceOf_(mary.account.address, INVALID);
const postNo = await usdtParaShare.balanceOf_(mary.account.address, NO);
Expand Down Expand Up @@ -272,7 +277,7 @@ describe('AMM Middleware for ERC20', () => {
});

console.log('Removing remaining liquidity without selling any received shares')
await middleware.doRemoveLiquidity(market.address, usdtParaShare.address, fee, lpTokens, SYMBOL_ROOT);
await middleware.doRemoveLiquidity(market.address, usdtParaShare.address, fee, lpTokens, SYMBOLS);

const postInvalid = await usdtParaShare.balanceOf_(mary.account.address, INVALID);
const postNo = await usdtParaShare.balanceOf_(mary.account.address, NO);
Expand Down
9 changes: 7 additions & 2 deletions packages/augur-test/src/tests/amm/ammEth.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ describe('AMM Middleware for ETH', () => {
const INCLUDE_FEE = true;
const EXCLUDE_FEE = false;
const SYMBOL_ROOT = 'symbol';
const SYMBOLS = [
`i${SYMBOL_ROOT}`,
`n${SYMBOL_ROOT}`,
`y${SYMBOL_ROOT}`
];

const ONE_ETH = bn(1000).times(1e18); // 1000 ETH

Expand Down Expand Up @@ -307,7 +312,7 @@ describe('AMM Middleware for ETH', () => {
});

console.log('Selling 1/3rd of LP tokens via removeLiquidity, then selling the resulting shares');
await middleware.doRemoveLiquidity(market.address, wethParaShare.address, fee, lpTokensToBurn, SYMBOL_ROOT);
await middleware.doRemoveLiquidity(market.address, wethParaShare.address, fee, lpTokensToBurn, SYMBOLS);

const postInvalid = await wethParaShare.balanceOf_(mary.account.address, INVALID);
const postNo = await wethParaShare.balanceOf_(mary.account.address, NO);
Expand Down Expand Up @@ -341,7 +346,7 @@ describe('AMM Middleware for ETH', () => {
});

console.log('Removing remaining liquidity without selling any received shares')
await middleware.doRemoveLiquidity(market.address, wethParaShare.address, fee, lpTokens, SYMBOL_ROOT);
await middleware.doRemoveLiquidity(market.address, wethParaShare.address, fee, lpTokens, SYMBOLS);

const postInvalid = await wethParaShare.balanceOf_(mary.account.address, INVALID);
const postNo = await wethParaShare.balanceOf_(mary.account.address, NO);
Expand Down

0 comments on commit 15ae9a6

Please sign in to comment.