Merge branch 'development' into feature/passNetworkId

2017-11-27 15:53:21 -06:00
parent 37f0051d83 4a17f5e820
commit cf0a8b2d05
316 changed files with 26300 additions and 144 deletions
--- a/packages/0x.js/test/token_wrapper_test.ts
+++ b/packages/0x.js/test/token_wrapper_test.ts
@@ -434,7 +434,7 @@ describe('TokenWrapper', () => {
        let tokenAddress: string;
        let tokenTransferProxyAddress: string;
        const subscriptionOpts: SubscriptionOpts = {
-            fromBlock: BlockParamLiteral.Earliest,
+            fromBlock: 0,
            toBlock: BlockParamLiteral.Latest,
        };
        let txHash: string;