diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-09-27 07:24:43 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-09-27 07:24:43 +0800 |
| commit | 8ab23c713db1f5d45abb0ba433450591b8759809 (patch) | |
| tree | c192fcf5eec3c7b422f3d0a91a4a96037c7f2fa6 /test/unit/keyring-controller-test.js | |
| parent | 77a48fb0b16d7415377b02a3b7d383c9ef86fcb6 (diff) | |
| parent | 6ca519e97c4c282023ab6b7788715ff8d7ec8189 (diff) | |
| download | tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.gz tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.bz2 tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.lz tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.xz tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.tar.zst tangerine-wallet-browser-8ab23c713db1f5d45abb0ba433450591b8759809.zip | |
Merge branch 'master' into transactionControllerRefractorPt3
Diffstat (limited to 'test/unit/keyring-controller-test.js')
| -rw-r--r-- | test/unit/keyring-controller-test.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js index 2d9a53723..135edf365 100644 --- a/test/unit/keyring-controller-test.js +++ b/test/unit/keyring-controller-test.js @@ -24,15 +24,12 @@ describe('KeyringController', function () { getTxList: () => [], getUnapprovedTxList: () => [], }, - ethStore: { + accountTracker: { addAccount (acct) { accounts.push(ethUtil.addHexPrefix(acct)) }, }, + encryptor: mockEncryptor, }) - // Stub out the browser crypto for a mock encryptor. - // Browser crypto is tested in the integration test suite. - keyringController.encryptor = mockEncryptor - keyringController.createNewVaultAndKeychain(password) .then(function (newState) { newState |