m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

keyring - rm config dep

Browse Source
This commit is contained in:
kumavis 2017-02-02 16:54:16 -08:00
parent 296b278592
commit 5c5aa6ea01
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/scripts/keyring-controller.js
View File

@ -33,7 +33,6 @@ class KeyringController extends EventEmitter {
keyrings: [], keyrings: [],
identities: {}, identities: {},
}) })
this.configManager = opts.configManager
this.ethStore = opts.ethStore this.ethStore = opts.ethStore
this.encryptor = encryptor this.encryptor = encryptor
this.keyrings = [] this.keyrings = []
@ -80,8 +79,6 @@ class KeyringController extends EventEmitter {
keyringTypes: memState.keyringTypes, keyringTypes: memState.keyringTypes,
identities: memState.identities, identities: memState.identities,
keyrings: memState.keyrings, keyrings: memState.keyrings,
// configManager
seedWords: this.configManager.getSeedWords(),
} }
return result return result
} }

4
app/scripts/metamask-controller.js
View File

@ -59,7 +59,6 @@ module.exports = class MetamaskController extends EventEmitter {
this.keyringController = new KeyringController({ this.keyringController = new KeyringController({
initState: initState.KeyringController, initState: initState.KeyringController,
ethStore: this.ethStore, ethStore: this.ethStore,
configManager: this.configManager,
getNetwork: this.getStateNetwork.bind(this), getNetwork: this.getStateNetwork.bind(this),
}) })
this.keyringController.on('newAccount', (address) => { this.keyringController.on('newAccount', (address) => {
@ -190,6 +189,7 @@ module.exports = class MetamaskController extends EventEmitter {
conversionRate: this.configManager.getConversionRate(), conversionRate: this.configManager.getConversionRate(),
conversionDate: this.configManager.getConversionDate(), conversionDate: this.configManager.getConversionDate(),
isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(),
seedWords: this.configManager.getSeedWords(),
} }
) )
} }
@ -339,7 +339,7 @@ module.exports = class MetamaskController extends EventEmitter {
.then((serialized) => { .then((serialized) => {
const seedWords = serialized.mnemonic const seedWords = serialized.mnemonic
this.configManager.setSeedWords(seedWords) this.configManager.setSeedWords(seedWords)
promiseToCallback(this.keyringController.fullUpdate())(cb) cb()
}) })
} }