From 1ad395cf86b2006c09bdae814607c2baf9790b91 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 4 Sep 2017 18:14:48 +0200
Subject: Make the functions immidiately return txHash instead of awaiting for
 a transaction to be mined

---
 test/utils/blockchain_lifecycle.ts | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'test/utils')

diff --git a/test/utils/blockchain_lifecycle.ts b/test/utils/blockchain_lifecycle.ts
index 50eb57b95..b4f742e63 100644
--- a/test/utils/blockchain_lifecycle.ts
+++ b/test/utils/blockchain_lifecycle.ts
@@ -17,4 +17,7 @@ export class BlockchainLifecycle {
             throw new Error(`Snapshot with id #${this.snapshotId} failed to revert`);
         }
     }
+    public async waitUntilMinedAsync(txHash: string): Promise<void> {
+        return undefined;
+    }
 }
-- 
cgit v1.2.3


From 6325a038188293658ad3d209cb95a2741911f5b9 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 4 Sep 2017 18:48:18 +0200
Subject: Temporarily remove web3_beta, cause it breaks installation and tests

---
 test/utils/web3_factory.ts | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'test/utils')

diff --git a/test/utils/web3_factory.ts b/test/utils/web3_factory.ts
index 4785fa858..b20070c74 100644
--- a/test/utils/web3_factory.ts
+++ b/test/utils/web3_factory.ts
@@ -6,7 +6,6 @@
 import ProviderEngine = require('web3-provider-engine');
 import RpcSubprovider = require('web3-provider-engine/subproviders/rpc');
 import * as Web3 from 'web3';
-import * as Web3_beta from 'web3_beta';
 import {constants} from './constants';
 import {EmptyWalletSubProvider} from '../../src/subproviders/empty_wallet_subprovider';
 
@@ -29,9 +28,4 @@ export const web3Factory = {
         provider.start();
         return provider;
     },
-    getProviderBeta(): Web3.Provider {
-        const rpcUrl = `http://${constants.RPC_HOST}:${constants.RPC_PORT}`;
-        const providerBeta = new Web3_beta.providers.HttpProvider(rpcUrl);
-        return providerBeta;
-    },
 };
-- 
cgit v1.2.3


From c9e490bdaec53e3a93b5da8daaaf0b1d87d9de76 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 4 Sep 2017 19:08:14 +0200
Subject: Implement zeroEx.awaitTransactionMined

---
 test/utils/blockchain_lifecycle.ts | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'test/utils')

diff --git a/test/utils/blockchain_lifecycle.ts b/test/utils/blockchain_lifecycle.ts
index b4f742e63..50eb57b95 100644
--- a/test/utils/blockchain_lifecycle.ts
+++ b/test/utils/blockchain_lifecycle.ts
@@ -17,7 +17,4 @@ export class BlockchainLifecycle {
             throw new Error(`Snapshot with id #${this.snapshotId} failed to revert`);
         }
     }
-    public async waitUntilMinedAsync(txHash: string): Promise<void> {
-        return undefined;
-    }
 }
-- 
cgit v1.2.3