aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2019-02-07 22:28:24 +0800
committerFabio Berger <me@fabioberger.com>2019-02-07 22:28:24 +0800
commit3dd652e7cf6da63831da143b73c13231a46da376 (patch)
tree52218d0b88717360fa8bfadf4bbf7e35b9ab5f66 /contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts
parent8de955f3d891620c90c668b4ac0b046e772d4da8 (diff)
parentf003298ce4c7a2201d2d59685b0d5d0411aeb55d (diff)
downloaddexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar
dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.gz
dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.bz2
dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.lz
dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.xz
dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.tar.zst
dexon-0x-contracts-3dd652e7cf6da63831da143b73c13231a46da376.zip
Merge branch 'development' into addAnalyticsToDevToolsPages
* development: (51 commits) Publish Updated CHANGELOGS Updated CHANGELOGS Update packages/sol-compiler/CHANGELOG.json Update packages/sol-compiler/CHANGELOG.json Move from devDep to dep Fix linter Update CHANGELOG Re-run yarn since fails again on first run Add PR numbers Omit remapping in compiler settings equality checks Omit remapping in compiler settings equality checks Fix a bug when ast and legacyAST were not present in the artifacts even if requested Update yarn.lock Remove the bin_paths and fetch the solidity release list from github repo Remove postinstall hack Fix the undefined opts bug Fix sol-compiler bug with remappings causing smart recompilation to now work re-add postinstall hack Fix deps versions ...
Diffstat (limited to 'contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts')
-rw-r--r--contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts10
1 files changed, 1 insertions, 9 deletions
diff --git a/contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts b/contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts
index 207106852..4f9f6110a 100644
--- a/contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts
+++ b/contracts/exchange-forwarder/test/utils/forwarder_wrapper.ts
@@ -1,6 +1,3 @@
-import { artifacts as erc20Artifacts } from '@0x/contracts-erc20';
-import { artifacts as erc721Artifacts } from '@0x/contracts-erc721';
-import { artifacts as exchangeArtifacts } from '@0x/contracts-exchange';
import { constants, formatters, LogDecoder, MarketSellOrders } from '@0x/contracts-test-utils';
import { SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils';
@@ -61,12 +58,7 @@ export class ForwarderWrapper {
constructor(contractInstance: ForwarderContract, provider: Provider) {
this._forwarderContract = contractInstance;
this._web3Wrapper = new Web3Wrapper(provider);
- this._logDecoder = new LogDecoder(this._web3Wrapper, {
- ...artifacts,
- ...erc20Artifacts,
- ...erc721Artifacts,
- ...exchangeArtifacts,
- });
+ this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts);
}
public async marketSellOrdersWithEthAsync(
orders: SignedOrder[],