aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange
diff options
context:
space:
mode:
Diffstat (limited to 'packages/contracts/test/exchange')
-rw-r--r--packages/contracts/test/exchange/core.ts48
-rw-r--r--packages/contracts/test/exchange/helpers.ts10
-rw-r--r--packages/contracts/test/exchange/wrapper.ts20
3 files changed, 39 insertions, 39 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index 2f357be57..a1f858c78 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -21,9 +21,9 @@ import {
} from '../../src/contract_wrappers/generated/exchange';
import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy';
import {
- encodeERC20ProxyMetadata,
- encodeERC20ProxyMetadata_V1,
- encodeERC721ProxyMetadata,
+ encodeERC20ProxyData,
+ encodeERC20V1ProxyData,
+ encodeERC721ProxyData,
} from '../../src/utils/asset_proxy_utils';
import { Balances } from '../../src/utils/balances';
import { constants } from '../../src/utils/constants';
@@ -132,7 +132,7 @@ describe('Exchange', () => {
const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [
zrx.address,
- encodeERC20ProxyMetadata(zrx.address),
+ encodeERC20ProxyData(zrx.address),
assetProxyDispatcher.address,
]);
exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider);
@@ -183,8 +183,8 @@ describe('Exchange', () => {
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
- makerAssetData: encodeERC20ProxyMetadata(rep.address),
- takerAssetData: encodeERC20ProxyMetadata(dgd.address),
+ makerAssetData: encodeERC20ProxyData(rep.address),
+ takerAssetData: encodeERC20ProxyData(dgd.address),
};
const privateKey = constants.TESTRPC_PRIVATE_KEYS[0];
orderFactory = new OrderFactory(privateKey, defaultOrderParams);
@@ -966,8 +966,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(1),
- makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyData(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyData(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -996,8 +996,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(1),
- makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyData(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyData(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1026,8 +1026,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(1),
- makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyData(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyData(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1052,8 +1052,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(1),
- makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyData(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyData(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1078,8 +1078,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(2),
takerTokenAmount: new BigNumber(1),
- makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyData(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyData(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1104,8 +1104,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(500),
- makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyData(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyData(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1130,8 +1130,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(0),
- makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyData(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyData(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1155,8 +1155,8 @@ describe('Exchange', () => {
takerTokenAddress: dgd.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
- makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetData: encodeERC20ProxyMetadata(dgd.address),
+ makerAssetData: encodeERC721ProxyData(ck.address, makerTokenId),
+ takerAssetData: encodeERC20ProxyData(dgd.address),
});
// Verify pre-conditions
@@ -1199,8 +1199,8 @@ describe('Exchange', () => {
makerTokenAddress: dgd.address,
takerTokenAmount: new BigNumber(1),
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
- takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
- makerAssetData: encodeERC20ProxyMetadata(dgd.address),
+ takerAssetData: encodeERC721ProxyData(ck.address, takerTokenId),
+ makerAssetData: encodeERC20ProxyData(dgd.address),
});
// Verify pre-conditions
diff --git a/packages/contracts/test/exchange/helpers.ts b/packages/contracts/test/exchange/helpers.ts
index 6990ac88b..48ece0a7a 100644
--- a/packages/contracts/test/exchange/helpers.ts
+++ b/packages/contracts/test/exchange/helpers.ts
@@ -7,9 +7,9 @@ import ethUtil = require('ethereumjs-util');
import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange';
import {
- encodeERC20ProxyMetadata,
- encodeERC20ProxyMetadata_V1,
- encodeERC721ProxyMetadata,
+ encodeERC20ProxyData,
+ encodeERC20V1ProxyData,
+ encodeERC721ProxyData,
} from '../../src/utils/asset_proxy_utils';
import { constants } from '../../src/utils/constants';
import { ExchangeWrapper } from '../../src/utils/exchange_wrapper';
@@ -88,8 +88,8 @@ describe('Exchange', () => {
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
- makerAssetData: encodeERC20ProxyMetadata(rep.address),
- takerAssetData: encodeERC20ProxyMetadata(dgd.address),
+ makerAssetData: encodeERC20ProxyData(rep.address),
+ takerAssetData: encodeERC20ProxyData(dgd.address),
};
const privateKey = constants.TESTRPC_PRIVATE_KEYS[0];
orderFactory = new OrderFactory(privateKey, defaultOrderParams);
diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts
index 8c55dfe19..aef21429f 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -16,9 +16,9 @@ import { ExchangeContract } from '../../src/contract_wrappers/generated/exchange
import { TokenRegistryContract } from '../../src/contract_wrappers/generated/token_registry';
import { TokenTransferProxyContract } from '../../src/contract_wrappers/generated/token_transfer_proxy';
import {
- encodeERC20ProxyMetadata,
- encodeERC20ProxyMetadata_V1,
- encodeERC721ProxyMetadata,
+ encodeERC20ProxyData,
+ encodeERC20V1ProxyData,
+ encodeERC721ProxyData,
} from '../../src/utils/asset_proxy_utils';
import { Balances } from '../../src/utils/balances';
import { constants } from '../../src/utils/constants';
@@ -100,7 +100,7 @@ describe('Exchange', () => {
);
const exchangeInstance = await deployer.deployAsync(ContractName.Exchange, [
zrx.address,
- encodeERC20ProxyMetadata(zrx.address),
+ encodeERC20ProxyData(zrx.address),
assetProxyDispatcher.address,
]);
exchange = new ExchangeContract(exchangeInstance.abi, exchangeInstance.address, provider);
@@ -139,8 +139,8 @@ describe('Exchange', () => {
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
- makerAssetData: encodeERC20ProxyMetadata(rep.address),
- takerAssetData: encodeERC20ProxyMetadata(dgd.address),
+ makerAssetData: encodeERC20ProxyData(rep.address),
+ takerAssetData: encodeERC20ProxyData(dgd.address),
};
const privateKey = constants.TESTRPC_PRIVATE_KEYS[0];
@@ -341,7 +341,7 @@ describe('Exchange', () => {
makerTokenAddress: zrx.address,
makerTokenAmount: makerZRXBalance,
makerFee: new BigNumber(1),
- makerAssetData: encodeERC20ProxyMetadata(zrx.address),
+ makerAssetData: encodeERC20ProxyData(zrx.address),
});
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
const newBalances = await dmyBalances.getAsync();
@@ -354,7 +354,7 @@ describe('Exchange', () => {
makerTokenAddress: zrx.address,
makerTokenAmount: new BigNumber(makerZRXAllowance),
makerFee: new BigNumber(1),
- makerAssetData: encodeERC20ProxyMetadata(zrx.address),
+ makerAssetData: encodeERC20ProxyData(zrx.address),
});
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
const newBalances = await dmyBalances.getAsync();
@@ -367,7 +367,7 @@ describe('Exchange', () => {
takerTokenAddress: zrx.address,
takerTokenAmount: takerZRXBalance,
takerFee: new BigNumber(1),
- takerAssetData: encodeERC20ProxyMetadata(zrx.address),
+ takerAssetData: encodeERC20ProxyData(zrx.address),
});
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
const newBalances = await dmyBalances.getAsync();
@@ -380,7 +380,7 @@ describe('Exchange', () => {
takerTokenAddress: zrx.address,
takerTokenAmount: new BigNumber(takerZRXAllowance),
takerFee: new BigNumber(1),
- takerAssetData: encodeERC20ProxyMetadata(zrx.address),
+ takerAssetData: encodeERC20ProxyData(zrx.address),
});
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
const newBalances = await dmyBalances.getAsync();