aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test
diff options
context:
space:
mode:
authorGreg Hysen <greg.hysen@gmail.com>2018-04-12 01:21:37 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-04-21 04:56:17 +0800
commitbc7672652ecbb39c57955d47cb96a8b9d558ba70 (patch)
tree0c3b623a3c7453ffe6643b40f03f9582d30af22c /packages/contracts/test
parentcc77f8489e5a176406d4871772fcbae58703bafc (diff)
downloaddexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.gz
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.bz2
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.lz
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.xz
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.tar.zst
dexon-sol-tools-bc7672652ecbb39c57955d47cb96a8b9d558ba70.zip
makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData
Diffstat (limited to 'packages/contracts/test')
-rw-r--r--packages/contracts/test/exchange/core.ts40
-rw-r--r--packages/contracts/test/exchange/helpers.ts4
-rw-r--r--packages/contracts/test/exchange/wrapper.ts12
3 files changed, 28 insertions, 28 deletions
diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts
index d95dbea35..2f357be57 100644
--- a/packages/contracts/test/exchange/core.ts
+++ b/packages/contracts/test/exchange/core.ts
@@ -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),
- makerAssetProxyData: encodeERC20ProxyMetadata(rep.address),
- takerAssetProxyData: encodeERC20ProxyMetadata(dgd.address),
+ makerAssetData: encodeERC20ProxyMetadata(rep.address),
+ takerAssetData: encodeERC20ProxyMetadata(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),
- makerAssetProxyData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetProxyData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -996,8 +996,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(1),
- makerAssetProxyData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetProxyData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1026,8 +1026,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(1),
- makerAssetProxyData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetProxyData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1052,8 +1052,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(1),
- makerAssetProxyData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetProxyData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1078,8 +1078,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(2),
takerTokenAmount: new BigNumber(1),
- makerAssetProxyData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetProxyData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1104,8 +1104,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(500),
- makerAssetProxyData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetProxyData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
});
// Verify pre-conditions
@@ -1130,8 +1130,8 @@ describe('Exchange', () => {
takerTokenAddress: ck.address,
makerTokenAmount: new BigNumber(1),
takerTokenAmount: new BigNumber(0),
- makerAssetProxyData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetProxyData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
+ takerAssetData: encodeERC721ProxyMetadata(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),
- makerAssetProxyData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
- takerAssetProxyData: encodeERC20ProxyMetadata(dgd.address),
+ makerAssetData: encodeERC721ProxyMetadata(ck.address, makerTokenId),
+ takerAssetData: encodeERC20ProxyMetadata(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),
- takerAssetProxyData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
- makerAssetProxyData: encodeERC20ProxyMetadata(dgd.address),
+ takerAssetData: encodeERC721ProxyMetadata(ck.address, takerTokenId),
+ makerAssetData: encodeERC20ProxyMetadata(dgd.address),
});
// Verify pre-conditions
diff --git a/packages/contracts/test/exchange/helpers.ts b/packages/contracts/test/exchange/helpers.ts
index ab5419e4f..6990ac88b 100644
--- a/packages/contracts/test/exchange/helpers.ts
+++ b/packages/contracts/test/exchange/helpers.ts
@@ -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),
- makerAssetProxyData: encodeERC20ProxyMetadata(rep.address),
- takerAssetProxyData: encodeERC20ProxyMetadata(dgd.address),
+ makerAssetData: encodeERC20ProxyMetadata(rep.address),
+ takerAssetData: encodeERC20ProxyMetadata(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 5b0564fd2..8c55dfe19 100644
--- a/packages/contracts/test/exchange/wrapper.ts
+++ b/packages/contracts/test/exchange/wrapper.ts
@@ -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),
- makerAssetProxyData: encodeERC20ProxyMetadata(rep.address),
- takerAssetProxyData: encodeERC20ProxyMetadata(dgd.address),
+ makerAssetData: encodeERC20ProxyMetadata(rep.address),
+ takerAssetData: encodeERC20ProxyMetadata(dgd.address),
};
const privateKey = constants.TESTRPC_PRIVATE_KEYS[0];
@@ -341,7 +341,7 @@ describe('Exchange', () => {
makerTokenAddress: zrx.address,
makerTokenAmount: makerZRXBalance,
makerFee: new BigNumber(1),
- makerAssetProxyData: encodeERC20ProxyMetadata(zrx.address),
+ makerAssetData: encodeERC20ProxyMetadata(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),
- makerAssetProxyData: encodeERC20ProxyMetadata(zrx.address),
+ makerAssetData: encodeERC20ProxyMetadata(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),
- takerAssetProxyData: encodeERC20ProxyMetadata(zrx.address),
+ takerAssetData: encodeERC20ProxyMetadata(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),
- takerAssetProxyData: encodeERC20ProxyMetadata(zrx.address),
+ takerAssetData: encodeERC20ProxyMetadata(zrx.address),
});
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
const newBalances = await dmyBalances.getAsync();