Skip to content

Commit

Permalink
remove this commit... this is only to see what happens in ci
Browse files Browse the repository at this point in the history
  • Loading branch information
frankiebee committed Feb 11, 2019
1 parent 30f25a6 commit 20dd7ae
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/scripts/controllers/recent-blocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class RecentBlocksController {
this.blockTracker = blockTracker
this.ethQuery = new EthQuery(provider)
this.historyLength = opts.historyLength || 40

if (!networkController) { throw new Error('RecentBlocksController requires access to networkController') }
const initState = extend({
recentBlocks: [],
}, opts.initState)
Expand Down
2 changes: 2 additions & 0 deletions app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ module.exports = class MetamaskController extends EventEmitter {
// rpc provider
this.initializeProvider()
this.provider = this.networkController.getProviderAndBlockTracker().provider
debugger
this.blockTracker = this.networkController.getProviderAndBlockTracker().blockTracker

// token exchange rate tracker
Expand All @@ -126,6 +127,7 @@ module.exports = class MetamaskController extends EventEmitter {
this.recentBlocksController = new RecentBlocksController({
blockTracker: this.blockTracker,
provider: this.provider,
networkController: this.networkController,
})

// account tracker watches balances, nonces, and any code at their address.
Expand Down
1 change: 1 addition & 0 deletions test/unit/app/controllers/metamask-controller-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ describe('MetaMaskController', function () {
// add sinon method spies
sandbox.spy(metamaskController.keyringController, 'createNewVaultAndKeychain')
sandbox.spy(metamaskController.keyringController, 'createNewVaultAndRestore')
console.log(Object.keys(metamaskController))
})

afterEach(function () {
Expand Down

0 comments on commit 20dd7ae

Please sign in to comment.