diff options
author | Greg Hysen <greg.hysen@gmail.com> | 2018-04-13 09:54:46 +0800 |
---|---|---|
committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:56:17 +0800 |
commit | cf8523da5fe532d637105886a6261ddd81f81183 (patch) | |
tree | 38fcff39a416d457bb163678ee3e94410c0ff6d7 /packages/contracts/test/exchange/core.ts | |
parent | 10707ebc3a8f04919db6d2210c267636036c10b7 (diff) | |
download | dexon-sol-tools-cf8523da5fe532d637105886a6261ddd81f81183.tar dexon-sol-tools-cf8523da5fe532d637105886a6261ddd81f81183.tar.gz dexon-sol-tools-cf8523da5fe532d637105886a6261ddd81f81183.tar.bz2 dexon-sol-tools-cf8523da5fe532d637105886a6261ddd81f81183.tar.lz dexon-sol-tools-cf8523da5fe532d637105886a6261ddd81f81183.tar.xz dexon-sol-tools-cf8523da5fe532d637105886a6261ddd81f81183.tar.zst dexon-sol-tools-cf8523da5fe532d637105886a6261ddd81f81183.zip |
Moved ERC721 FillOrderNoThrow tests into wrapper
Diffstat (limited to 'packages/contracts/test/exchange/core.ts')
-rw-r--r-- | packages/contracts/test/exchange/core.ts | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts index 00d6ea37f..9e201a8e7 100644 --- a/packages/contracts/test/exchange/core.ts +++ b/packages/contracts/test/exchange/core.ts @@ -90,7 +90,6 @@ describe('Exchange', () => { deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS), deployer.deployAsync(ContractName.DummyToken, constants.DUMMY_TOKEN_ARGS), deployer.deployAsync(ContractName.DummyERC721Token, constants.DUMMY_ERC721TOKEN_ARGS), - deployer.deployAsync(ContractName.DummyERC721Token, constants.DUMMY_ERC721TOKEN_ARGS), ]); rep = new DummyTokenContract(repInstance.abi, repInstance.address, provider); dgd = new DummyTokenContract(dgdInstance.abi, dgdInstance.address, provider); @@ -903,33 +902,6 @@ describe('Exchange', () => { expect(newOwnerTakerToken).to.be.bignumber.equal(makerAddress); }); - it('should successfully exchange a single token between the maker and taker (via filleOrderNoThrow)', async () => { - // Construct Exchange parameters - const makerTokenId = erc721MakerTokenIds[0]; - const takerTokenId = erc721TakerTokenIds[1]; - signedOrder = orderFactory.newSignedOrder({ - makerTokenAddress: erc721Token.address, - takerTokenAddress: erc721Token.address, - makerTokenAmount: new BigNumber(1), - takerTokenAmount: new BigNumber(1), - makerAssetData: encodeERC721ProxyData(erc721Token.address, makerTokenId), - takerAssetData: encodeERC721ProxyData(erc721Token.address, takerTokenId), - }); - // Verify pre-conditions - const initialOwnerMakerToken = await erc721Token.ownerOf.callAsync(makerTokenId); - expect(initialOwnerMakerToken).to.be.bignumber.equal(makerAddress); - const initialOwnerTakerToken = await erc721Token.ownerOf.callAsync(takerTokenId); - expect(initialOwnerTakerToken).to.be.bignumber.equal(takerAddress); - // Call Exchange - const takerTokenFillAmount = signedOrder.takerTokenAmount; - await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress, { takerTokenFillAmount }); - // Verify post-conditions - const newOwnerMakerToken = await erc721Token.ownerOf.callAsync(makerTokenId); - expect(newOwnerMakerToken).to.be.bignumber.equal(takerAddress); - const newOwnerTakerToken = await erc721Token.ownerOf.callAsync(takerTokenId); - expect(newOwnerTakerToken).to.be.bignumber.equal(makerAddress); - }); - it('should throw when maker does not own the token with id makerTokenId', async () => { // Construct Exchange parameters const makerTokenId = erc721TakerTokenIds[0]; |