crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In @0x/contracts-exchange: upgrading tests...

Browse Source
This commit is contained in:
Lawrence Forman
2019-04-04 19:19:37 -04:00
committed by Amir Bandeali
parent 15db5c8059
commit 4408604c2d
5 changed files with 239 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
contracts/exchange/test/dispatcher.ts
View File

@@ -11,12 +11,13 @@ import {
constants,
expectTransactionFailedAsync,
LogDecoder,
orderUtils,
provider,
txDefaults,
web3Wrapper,
} from '@0x/contracts-test-utils';
import { BlockchainLifecycle } from '@0x/dev-utils';
import { assetDataUtils } from '@0x/order-utils';
import { assetDataUtils, ExchangeRevertErrors } from '@0x/order-utils';
import { AssetProxyId, RevertReason } from '@0x/types';
import { BigNumber } from '@0x/utils';
import * as chai from 'chai';
@@ -135,20 +136,20 @@ describe('AssetProxyDispatcher', () => {
provider,
txDefaults,
);
// Register new ERC20 Transfer Proxy contract
return expectTransactionFailedAsync(
assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(newErc20TransferProxy.address, {
from: owner,
}),
RevertReason.AssetProxyAlreadyExists,
const expectedError = new ExchangeRevertErrors.AssetProxyExistsError(proxyAddress);
const tx = assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
newErc20TransferProxy.address,
{ from: owner },
);
return expect(tx).to.revertWith(expectedError);
});
it('should throw if requesting address is not owner', async () => {
return expectTransactionFailedAsync(
assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(erc20Proxy.address, { from: notOwner }),
RevertReason.OnlyContractOwner,
const tx = assetProxyDispatcher.registerAssetProxy.sendTransactionAsync(
erc20Proxy.address,
{ from: notOwner },
);
return expect(tx).to.revertWith(RevertReason.OnlyContractOwner);
});
it('should log an event with correct arguments when an asset proxy is registered', async () => {
@@ -180,6 +181,7 @@ describe('AssetProxyDispatcher', () => {
});
describe('dispatchTransferFrom', () => {
const orderHash = orderUtils.generatePseudoRandomOrderHash();
it('should dispatch transfer to registered proxy', async () => {
// Register ERC20 proxy
await web3Wrapper.awaitTransactionSuccessAsync(
@@ -194,6 +196,7 @@ describe('AssetProxyDispatcher', () => {
const amount = new BigNumber(10);
await web3Wrapper.awaitTransactionSuccessAsync(
await assetProxyDispatcher.publicDispatchTransferFrom.sendTransactionAsync(
orderHash,
encodedAssetData,
makerAddress,
takerAddress,
@@ -226,6 +229,7 @@ describe('AssetProxyDispatcher', () => {
const amount = constants.ZERO_AMOUNT;
const txReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
await assetProxyDispatcher.publicDispatchTransferFrom.sendTransactionAsync(
orderHash,
encodedAssetData,
makerAddress,
takerAddress,
@@ -253,6 +257,7 @@ describe('AssetProxyDispatcher', () => {
const amount = new BigNumber(10);
const txReceipt = await web3Wrapper.awaitTransactionSuccessAsync(
await assetProxyDispatcher.publicDispatchTransferFrom.sendTransactionAsync(
orderHash,
encodedAssetData,
makerAddress,
makerAddress,
@@ -271,16 +276,20 @@ describe('AssetProxyDispatcher', () => {
const encodedAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
// Perform a transfer from makerAddress to takerAddress
const amount = new BigNumber(10);
return expectTransactionFailedAsync(
assetProxyDispatcher.publicDispatchTransferFrom.sendTransactionAsync(
encodedAssetData,
makerAddress,
takerAddress,
amount,
{ from: owner },
),
RevertReason.AssetProxyDoesNotExist,
const expectedError = new ExchangeRevertErrors.AssetProxyDispatchError(
orderHash,
encodedAssetData,
ExchangeRevertErrors.AssetProxyDispatchErrorCodes.UnknownAssetProxy,
);
const tx = assetProxyDispatcher.publicDispatchTransferFrom.sendTransactionAsync(
orderHash,
encodedAssetData,
makerAddress,
takerAddress,
amount,
{ from: owner },
);
expect(tx).to.revertWith(expectedError);
});
});
});