aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-12-08 08:18:20 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-12-19 05:36:05 +0800
commita2df428afbd820b15ea108f721ab88f77a8d6dc1 (patch)
tree6cbc9e7922ffae09477b0fe40a5e322dad969b51
parente45a0ffdbfd5289b9e123a4b58c26d6dbbcfd8c7 (diff)
downloaddexon-sol-tools-a2df428afbd820b15ea108f721ab88f77a8d6dc1.tar
dexon-sol-tools-a2df428afbd820b15ea108f721ab88f77a8d6dc1.tar.gz
dexon-sol-tools-a2df428afbd820b15ea108f721ab88f77a8d6dc1.tar.bz2
dexon-sol-tools-a2df428afbd820b15ea108f721ab88f77a8d6dc1.tar.lz
dexon-sol-tools-a2df428afbd820b15ea108f721ab88f77a8d6dc1.tar.xz
dexon-sol-tools-a2df428afbd820b15ea108f721ab88f77a8d6dc1.tar.zst
dexon-sol-tools-a2df428afbd820b15ea108f721ab88f77a8d6dc1.zip
tests for marketSellOrders
-rw-r--r--packages/contracts/test/extensions/balance_threshold_filter.ts108
1 files changed, 99 insertions, 9 deletions
diff --git a/packages/contracts/test/extensions/balance_threshold_filter.ts b/packages/contracts/test/extensions/balance_threshold_filter.ts
index efe1ce49c..4c927f1d1 100644
--- a/packages/contracts/test/extensions/balance_threshold_filter.ts
+++ b/packages/contracts/test/extensions/balance_threshold_filter.ts
@@ -271,7 +271,7 @@ describe.only(ContractName.BalanceThresholdFilter, () => {
await blockchainLifecycle.revertAsync();
});
- describe.only('General Sanity Checks', () => {
+ describe('General Sanity Checks', () => {
it('should revert if the signed transaction is not intended for supported', async () => {
// Create signed order without the fillOrder function selector
const txDataBuf = ethUtil.toBuffer(compliantSignedFillOrderTx.data);
@@ -317,7 +317,7 @@ describe.only(ContractName.BalanceThresholdFilter, () => {
// @TODO - greater than 1 balance
});
- describe.only('batchFillOrders', () => {
+ describe('batchFillOrders', () => {
beforeEach(async () => {
erc20Balances = await erc20Wrapper.getBalancesAsync();
compliantSignedOrder = await orderFactory.newSignedOrderAsync();
@@ -411,7 +411,7 @@ describe.only(ContractName.BalanceThresholdFilter, () => {
});
});
- describe.only('batchFillOrdersNoThrow', () => {
+ describe('batchFillOrdersNoThrow', () => {
beforeEach(async () => {
erc20Balances = await erc20Wrapper.getBalancesAsync();
compliantSignedOrder = await orderFactory.newSignedOrderAsync();
@@ -505,7 +505,7 @@ describe.only(ContractName.BalanceThresholdFilter, () => {
});
});
- describe.only('batchFillOrKillOrders', () => {
+ describe('batchFillOrKillOrders', () => {
beforeEach(async () => {
erc20Balances = await erc20Wrapper.getBalancesAsync();
compliantSignedOrder = await orderFactory.newSignedOrderAsync();
@@ -612,7 +612,7 @@ describe.only(ContractName.BalanceThresholdFilter, () => {
});
});
- describe.only('fillOrder', () => {
+ describe('fillOrder', () => {
beforeEach(async () => {
erc20Balances = await erc20Wrapper.getBalancesAsync();
compliantSignedOrder = await orderFactory.newSignedOrderAsync();
@@ -684,7 +684,7 @@ describe.only(ContractName.BalanceThresholdFilter, () => {
});
});
- describe.only('fillOrderNoThrow', () => {
+ describe('fillOrderNoThrow', () => {
beforeEach(async () => {
erc20Balances = await erc20Wrapper.getBalancesAsync();
compliantSignedOrder = await orderFactory.newSignedOrderAsync();
@@ -756,7 +756,7 @@ describe.only(ContractName.BalanceThresholdFilter, () => {
});
});
- describe.only('fillOrKillOrder', () => {
+ describe('fillOrKillOrder', () => {
beforeEach(async () => {
erc20Balances = await erc20Wrapper.getBalancesAsync();
compliantSignedOrder = await orderFactory.newSignedOrderAsync();
@@ -840,11 +840,101 @@ describe.only(ContractName.BalanceThresholdFilter, () => {
});
});
- describe('marketBuyOrders', () => {
+ describe.only('marketSellOrders', () => {
+ beforeEach(async () => {
+ erc20Balances = await erc20Wrapper.getBalancesAsync();
+ compliantSignedOrder = await orderFactory.newSignedOrderAsync();
+ compliantSignedOrder2 = await orderFactory2.newSignedOrderAsync();
+ });
+ it('should transfer the correct amounts and validate both makers/taker when both makers and taker meet the balance threshold', async () => {
+ // Execute a valid fill
+ const orders = [compliantSignedOrder, compliantSignedOrder2];
+ const cumulativeTakerAssetFillAmount = compliantSignedOrder.takerAssetAmount.plus(takerAssetFillAmount);
+ const txReceipt = await balanceThresholdWrapper.marketSellOrdersAsync(orders, compliantTakerAddress, {takerAssetFillAmount: cumulativeTakerAssetFillAmount});
+ // Assert validated addresses
+ const expectedValidatedAddresseses = [compliantSignedOrder.makerAddress, compliantSignedOrder2.makerAddress, compliantSignedFillOrderTx.signerAddress];
+ assertValidatedAddressesLog(txReceipt, expectedValidatedAddresseses);
+ // Check balances
+ const newBalances = await erc20Wrapper.getBalancesAsync();
+ const makerAssetFillAmount2 = takerAssetFillAmount
+ .times(compliantSignedOrder.makerAssetAmount)
+ .dividedToIntegerBy(compliantSignedOrder.takerAssetAmount);
+ const makerFeePaid2 = compliantSignedOrder2.makerFee
+ .times(makerAssetFillAmount2)
+ .dividedToIntegerBy(compliantSignedOrder2.makerAssetAmount);
+ const takerFeePaid2 = compliantSignedOrder2.takerFee
+ .times(makerAssetFillAmount2)
+ .dividedToIntegerBy(compliantSignedOrder2.makerAssetAmount);
+ const takerFeePaid = compliantSignedOrder.takerFee.plus(takerFeePaid2);
+ const cumulativeMakerAssetFillAmount = compliantSignedOrder.makerAssetAmount.plus(makerAssetFillAmount2);
+ // Maker #1
+ expect(newBalances[compliantMakerAddress][defaultMakerAssetAddress]).to.be.bignumber.equal(
+ erc20Balances[compliantMakerAddress][defaultMakerAssetAddress].minus(compliantSignedOrder.makerAssetAmount),
+ );
+ expect(newBalances[compliantMakerAddress][defaultTakerAssetAddress]).to.be.bignumber.equal(
+ erc20Balances[compliantMakerAddress][defaultTakerAssetAddress].add(compliantSignedOrder.takerAssetAmount),
+ );
+ expect(newBalances[compliantMakerAddress][zrxToken.address]).to.be.bignumber.equal(
+ erc20Balances[compliantMakerAddress][zrxToken.address].minus(compliantSignedOrder.makerFee),
+ );
+ // Maker #2
+ expect(newBalances[compliantMakerAddress2][defaultMakerAssetAddress]).to.be.bignumber.equal(
+ erc20Balances[compliantMakerAddress2][defaultMakerAssetAddress].minus(makerAssetFillAmount2),
+ );
+ expect(newBalances[compliantMakerAddress2][defaultTakerAssetAddress]).to.be.bignumber.equal(
+ erc20Balances[compliantMakerAddress2][defaultTakerAssetAddress].add(takerAssetFillAmount),
+ );
+ expect(newBalances[compliantMakerAddress2][zrxToken.address]).to.be.bignumber.equal(
+ erc20Balances[compliantMakerAddress2][zrxToken.address].minus(makerFeePaid2),
+ );
+ // Taker
+ expect(newBalances[compliantTakerAddress][defaultTakerAssetAddress]).to.be.bignumber.equal(
+ erc20Balances[compliantTakerAddress][defaultTakerAssetAddress].minus(cumulativeTakerAssetFillAmount),
+ );
+ expect(newBalances[compliantTakerAddress][defaultMakerAssetAddress]).to.be.bignumber.equal(
+ erc20Balances[compliantTakerAddress][defaultMakerAssetAddress].add(cumulativeMakerAssetFillAmount),
+ );
+ expect(newBalances[compliantTakerAddress][zrxToken.address]).to.be.bignumber.equal(
+ erc20Balances[compliantTakerAddress][zrxToken.address].minus(takerFeePaid),
+ );
+ // Fee recipient
+ expect(newBalances[feeRecipientAddress][zrxToken.address]).to.be.bignumber.equal(
+ erc20Balances[feeRecipientAddress][zrxToken.address].add(compliantSignedOrder.makerFee).add(makerFeePaid2).add(takerFeePaid),
+ );
+ });
+ it('should revert if one maker does not meet the balance threshold', async () => {
+ // Create order set with one non-compliant maker address
+ const signedOrderWithBadMakerAddress = await orderFactory.newSignedOrderAsync({
+ makerAddress: nonCompliantAddress
+ });
+ const orders = [compliantSignedOrder, signedOrderWithBadMakerAddress];
+ // Execute transaction
+ return expectTransactionFailedAsync(
+ balanceThresholdWrapper.marketSellOrdersAsync(
+ orders,
+ compliantTakerAddress,
+ {takerAssetFillAmount}
+ ),
+ RevertReason.AtLeastOneAddressDoesNotMeetBalanceThreshold
+ );
+ });
+ it('should revert if taker does not meet the balance threshold', async () => {
+ const orders = [compliantSignedOrder, compliantSignedOrder2];
+ return expectTransactionFailedAsync(
+ nonCompliantBalanceThresholdWrapper.marketSellOrdersAsync(
+ orders,
+ nonCompliantAddress,
+ {takerAssetFillAmount}
+ ),
+ RevertReason.AtLeastOneAddressDoesNotMeetBalanceThreshold
+ );
+ });
});
- describe('marketBuyOrdersNoThrow', () => {
+ describe.only('marketBuyOrdersNoThrow', () => {
+
});
+
describe('marketSellOrders', () => {
});