- 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
This commit is contained in:
Fabio Berger
2018-06-15 00:00:02 +02:00
parent 12033abe09
commit eea86757d5
10 changed files with 340 additions and 83 deletions

View File

@@ -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);