Merge branch 'development' into 3.0

2019-08-16 23:32:51 -07:00
parent 4c78b7d4bb 0ae2d8bab5
commit 22c8a25a26
637 changed files with 26270 additions and 17410 deletions
--- a/contracts/exchange-forwarder/test/forwarder.ts
+++ b/contracts/exchange-forwarder/test/forwarder.ts
@@ -102,7 +102,6 @@ describe(ContractName.Forwarder, () => {
            exchangeArtifacts.Exchange,
            provider,
            txDefaults,
-            zrxAssetData,
            new BigNumber(chainId),
        );
        exchangeWrapper = new ExchangeWrapper(exchangeInstance, provider);
@@ -177,7 +176,6 @@ describe(ContractName.Forwarder, () => {
                exchangeArtifacts.Exchange,
                provider,
                txDefaults,
-                zrxAssetData,
                new BigNumber(chainId),
            );
            return expectContractCreationFailedAsync(