aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange/transactions.ts
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-06-02 05:17:13 +0800
committerGreg Hysen <greg.hysen@gmail.com>2018-06-08 06:38:48 +0800
commite4e36760952287a84f8991df8589c183036383db (patch)
tree83c5ba694848232f6d3b01a72dc8c3d94cb9d071 /packages/contracts/test/exchange/transactions.ts
parent3ed13150e106c19563c8e9b06621be3d44d66b6c (diff)
downloaddexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar
dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.gz
dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.bz2
dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.lz
dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.xz
dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.tar.zst
dexon-sol-tools-e4e36760952287a84f8991df8589c183036383db.zip
Fixed up after rebasing. Contracts build and tests pass
Diffstat (limited to 'packages/contracts/test/exchange/transactions.ts')
-rw-r--r--packages/contracts/test/exchange/transactions.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts
index 8c5bc7bec..12390ce01 100644
--- a/packages/contracts/test/exchange/transactions.ts
+++ b/packages/contracts/test/exchange/transactions.ts
@@ -224,8 +224,8 @@ describe('Exchange transactions', () => {
exchangeAddress: exchange.address,
makerAddress,
feeRecipientAddress,
- makerAssetData: assetProxyUtils.encodeERC20ProxyData(defaultMakerTokenAddress),
- takerAssetData: assetProxyUtils.encodeERC20ProxyData(defaultTakerTokenAddress),
+ makerAssetData: assetProxyUtils.encodeERC20AssetData(defaultMakerTokenAddress),
+ takerAssetData: assetProxyUtils.encodeERC20AssetData(defaultTakerTokenAddress),
};
whitelistOrderFactory = new OrderFactory(makerPrivateKey, defaultOrderParams);
});