aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-04-18 03:01:33 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-04-21 04:56:18 +0800
commit0e3544e1f997d57089023e65ea9030270914e8eb (patch)
treefa9e735bef10c7aeebfa1bd57817b29043fa71c2 /packages/contracts/test/exchange
parentf4589b5bd4517cecc017bde91b0de9efbe75888b (diff)
downloaddexon-0x-contracts-0e3544e1f997d57089023e65ea9030270914e8eb.tar.gz
dexon-0x-contracts-0e3544e1f997d57089023e65ea9030270914e8eb.tar.zst
dexon-0x-contracts-0e3544e1f997d57089023e65ea9030270914e8eb.zip
Miscellaneous style changes to the contracts package; specifically tests
Diffstat (limited to 'packages/contracts/test/exchange')
-rw-r--r--packages/contracts/test/exchange/core.ts6
-rw-r--r--packages/contracts/test/exchange/wrapper.ts6
2 files changed, 8 insertions, 4 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index 6971ac170..4e5ab4031 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -107,10 +107,11 @@ describe('Exchange', () => {
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});
+ const prevERC20ProxyAddress = ZeroEx.NULL_ADDRESS;
await assetProxyDispatcher.addAssetProxy.sendTransactionAsync(
AssetProxyId.ERC20,
erc20Proxy.address,
- ZeroEx.NULL_ADDRESS,
+ prevERC20ProxyAddress,
{ from: owner },
);
// Deploy ERC721 Proxy
@@ -119,10 +120,11 @@ describe('Exchange', () => {
await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});
+ const prevERC721ProxyAddress = ZeroEx.NULL_ADDRESS;
await assetProxyDispatcher.addAssetProxy.sendTransactionAsync(
AssetProxyId.ERC721,
erc721Proxy.address,
- ZeroEx.NULL_ADDRESS,
+ prevERC721ProxyAddress,
{ from: owner },
);
// Deploy and configure Exchange
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index fe754c679..5f1d3111b 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -88,10 +88,11 @@ describe('Exchange', () => {
await erc20Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});
+ const prevERC20ProxyAddress = ZeroEx.NULL_ADDRESS;
await assetProxyDispatcher.addAssetProxy.sendTransactionAsync(
AssetProxyId.ERC20,
erc20Proxy.address,
- ZeroEx.NULL_ADDRESS,
+ prevERC20ProxyAddress,
{ from: owner },
);
// Deploy ERC721 Proxy
@@ -100,10 +101,11 @@ describe('Exchange', () => {
await erc721Proxy.addAuthorizedAddress.sendTransactionAsync(assetProxyDispatcher.address, {
from: owner,
});
+ const prevERC721ProxyAddress = ZeroEx.NULL_ADDRESS;
await assetProxyDispatcher.addAssetProxy.sendTransactionAsync(
AssetProxyId.ERC721,
erc721Proxy.address,
- ZeroEx.NULL_ADDRESS,
+ prevERC721ProxyAddress,
{ from: owner },
);
// Deploy and configure Exchange