aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-06-15 06:00:02 +0800
committerFabio Berger <me@fabioberger.com>2018-06-15 06:00:02 +0800
commiteea86757d5cdd63de4b0b06f7dd76fc2c2ddbd36 (patch)
treecb281c8fba3f1535d6b7f7a5de7f880a2257e776 /packages/contracts/test
parent12033abe095e902102f1d56e7a2711a630e6826b (diff)
downloaddexon-sol-tools-eea86757d5cdd63de4b0b06f7dd76fc2c2ddbd36.tar
dexon-sol-tools-eea86757d5cdd63de4b0b06f7dd76fc2c2ddbd36.tar.gz
dexon-sol-tools-eea86757d5cdd63de4b0b06f7dd76fc2c2ddbd36.tar.bz2
dexon-sol-tools-eea86757d5cdd63de4b0b06f7dd76fc2c2ddbd36.tar.lz
dexon-sol-tools-eea86757d5cdd63de4b0b06f7dd76fc2c2ddbd36.tar.xz
dexon-sol-tools-eea86757d5cdd63de4b0b06f7dd76fc2c2ddbd36.tar.zst
dexon-sol-tools-eea86757d5cdd63de4b0b06f7dd76fc2c2ddbd36.zip
- Refactor assetWrapper to contain more of the normalizing logic instead of erc20Wrapper and erc721Wrapper
- Add burn method to DummyERC721Token - Add additional methods to assetWrapper to set balance/allowances on ERC20 and ERC721 tokens - Use approve instead of approveAll for ERC721 tokens
Diffstat (limited to 'packages/contracts/test')
-rw-r--r--packages/contracts/test/asset_proxy/proxies.ts3
-rw-r--r--packages/contracts/test/exchange/wrapper.ts2
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/contracts/test/asset_proxy/proxies.ts b/packages/contracts/test/asset_proxy/proxies.ts
index 9760d3b9c..4a51e0db8 100644
--- a/packages/contracts/test/asset_proxy/proxies.ts
+++ b/packages/contracts/test/asset_proxy/proxies.ts
@@ -473,7 +473,8 @@ describe('Asset Transfer Proxies', () => {
txHash,
constants.AWAIT_TRANSACTION_MINED_MS,
);
- expect(res.logs.length).to.equal(numTransfers);
+ const numApproveEvents = 2;
+ expect(res.logs.length).to.equal(numTransfers + numApproveEvents);
const newOwnerMakerAssetA = await erc721Token.ownerOf.callAsync(makerTokenIdA);
const newOwnerMakerAssetB = await erc721Token.ownerOf.callAsync(makerTokenIdB);
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index abba1ac4f..00c5e4352 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -369,7 +369,7 @@ describe('Exchange wrappers', () => {
// HACK(albrow): We need to hardcode the gas estimate here because
// the Geth gas estimator doesn't work with the way we use
// delegatecall and swallow errors.
- gas: 270000,
+ gas: 280000,
});
// Verify post-conditions
const newOwnerMakerAsset = await erc721Token.ownerOf.callAsync(makerAssetId);