aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-21 03:07:53 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-21 03:07:53 +0800
commit0deed1775237bc8d48eb41e83b5a661b55e4b6be (patch)
treed2453cb6ef09a0c76fc413d93d1a6cd7c008f117 /app/scripts/keyring-controller.js
parent383f8ea7dc4a264613cfe92b257878eb78438ce7 (diff)
downloadtangerine-wallet-browser-0deed1775237bc8d48eb41e83b5a661b55e4b6be.tar
tangerine-wallet-browser-0deed1775237bc8d48eb41e83b5a661b55e4b6be.tar.gz
tangerine-wallet-browser-0deed1775237bc8d48eb41e83b5a661b55e4b6be.tar.bz2
tangerine-wallet-browser-0deed1775237bc8d48eb41e83b5a661b55e4b6be.tar.lz
tangerine-wallet-browser-0deed1775237bc8d48eb41e83b5a661b55e4b6be.tar.xz
tangerine-wallet-browser-0deed1775237bc8d48eb41e83b5a661b55e4b6be.tar.zst
tangerine-wallet-browser-0deed1775237bc8d48eb41e83b5a661b55e4b6be.zip
Fix tests
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index f6b1e9358..d25dddba1 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -35,7 +35,7 @@ module.exports = class KeyringController extends EventEmitter {
}
createNewVault(password, entropy, cb) {
- const salt = generateNewSalt()
+ const salt = generateSalt()
this.configManager.setSalt(salt)
this.loadKey(password)
.then((key) => {