diff options
| author | Frankie <frankie.diamond@gmail.com> | 2017-07-26 05:46:31 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 05:46:31 +0800 |
| commit | 0c73d6d852ac9c98613f71d6ee87f9d89c3c2b47 (patch) | |
| tree | 12c7ec8193ddf6ed0b95423b12a3b0ed438957c7 /app/scripts/controllers/network.js | |
| parent | e081ddf34734aa647e030b9900fc225150df044a (diff) | |
| parent | 5ec73c0e652f5389d14d00abed3977324043a824 (diff) | |
| download | tangerine-wallet-browser-0c73d6d852ac9c98613f71d6ee87f9d89c3c2b47.tar.gz tangerine-wallet-browser-0c73d6d852ac9c98613f71d6ee87f9d89c3c2b47.tar.zst tangerine-wallet-browser-0c73d6d852ac9c98613f71d6ee87f9d89c3c2b47.zip | |
Merge pull request #1824 from MetaMask/tx-cont-fix
TransactionController & NetworkController fixes
Diffstat (limited to 'app/scripts/controllers/network.js')
| -rw-r--r-- | app/scripts/controllers/network.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js index c07f13b8d..0a3e5e26b 100644 --- a/app/scripts/controllers/network.js +++ b/app/scripts/controllers/network.js @@ -28,9 +28,9 @@ module.exports = class NetworkController extends EventEmitter { this._provider = provider } - initializeProvider (opts) { + initializeProvider (opts, providerContructor = MetaMaskProvider) { this.providerInit = opts - this._provider = MetaMaskProvider(opts) + this._provider = providerContructor(opts) this._proxy = new Proxy(this._provider, { get: (obj, name) => { if (name === 'on') return this._on.bind(this) @@ -38,6 +38,7 @@ module.exports = class NetworkController extends EventEmitter { }, set: (obj, name, value) => { this._provider[name] = value + return value }, }) this.provider.on('block', this._logBlock.bind(this)) |