diff options
author | Greg Hysen <greg.hysen@gmail.com> | 2018-12-04 08:36:19 +0800 |
---|---|---|
committer | Greg Hysen <greg.hysen@gmail.com> | 2018-12-19 05:36:05 +0800 |
commit | a332c5e5c2ff11a7d4bd534f694d7859483a33f0 (patch) | |
tree | 2f1c128662dbd5eabccfb092ccc645360ab22f90 /packages/contracts/test | |
parent | bab7569ed9b0739a3d01c64dea17adb1bf5b82e1 (diff) | |
download | dexon-sol-tools-a332c5e5c2ff11a7d4bd534f694d7859483a33f0.tar dexon-sol-tools-a332c5e5c2ff11a7d4bd534f694d7859483a33f0.tar.gz dexon-sol-tools-a332c5e5c2ff11a7d4bd534f694d7859483a33f0.tar.bz2 dexon-sol-tools-a332c5e5c2ff11a7d4bd534f694d7859483a33f0.tar.lz dexon-sol-tools-a332c5e5c2ff11a7d4bd534f694d7859483a33f0.tar.xz dexon-sol-tools-a332c5e5c2ff11a7d4bd534f694d7859483a33f0.tar.zst dexon-sol-tools-a332c5e5c2ff11a7d4bd534f694d7859483a33f0.zip |
Code to validate addresses from order arrays
Diffstat (limited to 'packages/contracts/test')
-rw-r--r-- | packages/contracts/test/extensions/compliant_forwarder.ts | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/packages/contracts/test/extensions/compliant_forwarder.ts b/packages/contracts/test/extensions/compliant_forwarder.ts index 639893798..846414685 100644 --- a/packages/contracts/test/extensions/compliant_forwarder.ts +++ b/packages/contracts/test/extensions/compliant_forwarder.ts @@ -206,7 +206,7 @@ describe.only(ContractName.CompliantForwarder, () => { afterEach(async () => { await blockchainLifecycle.revertAsync(); }); - describe.only('fillOrder', () => { + describe('fillOrder', () => { beforeEach(async () => { erc20Balances = await erc20Wrapper.getBalancesAsync(); }); @@ -334,6 +334,32 @@ describe.only(ContractName.CompliantForwarder, () => { ); }); }); + + describe.only('batchFillOrders', () => { + beforeEach(async () => { + erc20Balances = await erc20Wrapper.getBalancesAsync(); + }); + it.only ('should transfer the correct amounts when maker and taker are compliant', async () => { + let order2 = _.cloneDeep(compliantSignedOrder); + order2.makerAddress = `0x${_.reverse(compliantSignedOrder.makerAddress.slice(2).split('')).join('')}`; + const orders = [compliantSignedOrder, order2]; + const fillAmounts = [new BigNumber(4), new BigNumber(4)]; + const signatures = ["0xabcd", "0xabcd"]; + const exchangeCalldata = exchangeInstance.batchFillOrders.getABIEncodedTransactionData(orders, fillAmounts, signatures); + console.log('*'.repeat(40), exchangeCalldata, '*'.repeat(40)); + console.log('****** MAKER ADDRESS = ', compliantSignedOrder.makerAddress); + + const txHash = await compliantForwarderInstance.executeTransaction.sendTransactionAsync( + compliantSignedFillOrderTx.salt, + compliantSignedFillOrderTx.signerAddress, + exchangeCalldata, + compliantSignedFillOrderTx.signature, + ); + const decoder = new LogDecoder(web3Wrapper); + const tx = await decoder.getTxWithDecodedLogsAsync(txHash); + console.log(JSON.stringify(tx, null, 4)); + }); + }); }); // tslint:disable:max-file-line-count // tslint:enable:no-unnecessary-type-assertion |