diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-09-26 02:46:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 02:46:04 +0800 |
| commit | 95afdfe3685a2e666510e203f7d9d7607e703006 (patch) | |
| tree | 6e3b19b480de241884ed2da0809f92a5c4593f31 /app/scripts/keyring-controller.js | |
| parent | 73d9434ad63e18a87bd3ed13a285eb37c9c6ae7c (diff) | |
| parent | 4c971ebfd1fad18368ec418c36c4d05a6bb37e6d (diff) | |
| download | tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.tar.gz tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.tar.zst tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.zip | |
Merge pull request #2145 from MetaMask/ConfigurableEncryption
Configurable encryption
Diffstat (limited to 'app/scripts/keyring-controller.js')
| -rw-r--r-- | app/scripts/keyring-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index fd57fac70..adfa4a813 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -36,7 +36,7 @@ class KeyringController extends EventEmitter { identities: {}, }) this.ethStore = opts.ethStore - this.encryptor = encryptor + this.encryptor = opts.encryptor || encryptor this.keyrings = [] this.getNetwork = opts.getNetwork } |