aboutsummaryrefslogtreecommitdiffstats
path: root/contracts
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-10-18 04:10:51 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-12-21 01:13:36 +0800
commit2fa8b8d1d054015bfac49401c4f6eb5af9309603 (patch)
tree3fcdae019ee78c50e7c29592c408a3fa8aa2668a /contracts
parentb786836db61de22fa290d94ac3f12fe5342aecc7 (diff)
downloaddexon-0x-contracts-2fa8b8d1d054015bfac49401c4f6eb5af9309603.tar
dexon-0x-contracts-2fa8b8d1d054015bfac49401c4f6eb5af9309603.tar.gz
dexon-0x-contracts-2fa8b8d1d054015bfac49401c4f6eb5af9309603.tar.bz2
dexon-0x-contracts-2fa8b8d1d054015bfac49401c4f6eb5af9309603.tar.lz
dexon-0x-contracts-2fa8b8d1d054015bfac49401c4f6eb5af9309603.tar.xz
dexon-0x-contracts-2fa8b8d1d054015bfac49401c4f6eb5af9309603.tar.zst
dexon-0x-contracts-2fa8b8d1d054015bfac49401c4f6eb5af9309603.zip
Add OrderMatcher tests
Diffstat (limited to 'contracts')
-rw-r--r--contracts/extensions/test/extensions/forwarder.ts3
-rw-r--r--contracts/protocol/src/wrappers/index.ts1
-rw-r--r--contracts/protocol/tsconfig.json1
-rw-r--r--contracts/test-utils/src/constants.ts1
4 files changed, 4 insertions, 2 deletions
diff --git a/contracts/extensions/test/extensions/forwarder.ts b/contracts/extensions/test/extensions/forwarder.ts
index 4027f493d..69939ed04 100644
--- a/contracts/extensions/test/extensions/forwarder.ts
+++ b/contracts/extensions/test/extensions/forwarder.ts
@@ -48,7 +48,6 @@ describe(ContractName.Forwarder, () => {
let owner: string;
let takerAddress: string;
let feeRecipientAddress: string;
- let otherAddress: string;
let defaultMakerAssetAddress: string;
let zrxAssetData: string;
let wethAssetData: string;
@@ -78,7 +77,7 @@ describe(ContractName.Forwarder, () => {
before(async () => {
await blockchainLifecycle.startAsync();
const accounts = await web3Wrapper.getAvailableAddressesAsync();
- const usedAddresses = ([owner, makerAddress, takerAddress, feeRecipientAddress, otherAddress] = accounts);
+ const usedAddresses = ([owner, makerAddress, takerAddress, feeRecipientAddress] = accounts);
const txHash = await web3Wrapper.sendTransactionAsync({ from: accounts[0], to: accounts[0], value: 0 });
const transaction = await web3Wrapper.getTransactionByHashAsync(txHash);
diff --git a/contracts/protocol/src/wrappers/index.ts b/contracts/protocol/src/wrappers/index.ts
index ac951d269..13f16f44f 100644
--- a/contracts/protocol/src/wrappers/index.ts
+++ b/contracts/protocol/src/wrappers/index.ts
@@ -3,6 +3,7 @@ export * from '../../generated-wrappers/erc20_proxy';
export * from '../../generated-wrappers/erc721_proxy';
export * from '../../generated-wrappers/exchange';
export * from '../../generated-wrappers/mixin_authorizable';
+export * from '../../generated-wrappers/order_matcher';
export * from '../../generated-wrappers/order_validator';
export * from '../../generated-wrappers/test_asset_proxy_dispatcher';
export * from '../../generated-wrappers/test_asset_proxy_owner';
diff --git a/contracts/protocol/tsconfig.json b/contracts/protocol/tsconfig.json
index 989d3ef2b..7e4ce5eb4 100644
--- a/contracts/protocol/tsconfig.json
+++ b/contracts/protocol/tsconfig.json
@@ -13,6 +13,7 @@
"./generated-artifacts/Exchange.json",
"./generated-artifacts/MixinAuthorizable.json",
"./generated-artifacts/MultiAssetProxy.json",
+ "./generated-artifacts/OrderMatcher.json",
"./generated-artifacts/OrderValidator.json",
"./generated-artifacts/TestAssetProxyDispatcher.json",
"./generated-artifacts/TestAssetProxyOwner.json",
diff --git a/contracts/test-utils/src/constants.ts b/contracts/test-utils/src/constants.ts
index d2c3ab512..f631dc81a 100644
--- a/contracts/test-utils/src/constants.ts
+++ b/contracts/test-utils/src/constants.ts
@@ -29,6 +29,7 @@ export const constants = {
MAX_TOKEN_TRANSFERFROM_GAS: 80000,
MAX_TOKEN_APPROVE_GAS: 60000,
MAX_TRANSFER_FROM_GAS: 150000,
+ MAX_MATCH_ORDERS_GAS: 400000,
DUMMY_TOKEN_NAME: '',
DUMMY_TOKEN_SYMBOL: '',
DUMMY_TOKEN_DECIMALS: new BigNumber(18),