diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-09-26 05:37:11 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-09-26 05:37:11 +0800 |
| commit | d9c92cdbd170e40622f081c2d45edaf970280954 (patch) | |
| tree | 8464aa2f1915228d049738511a8fa463166fc07a /test | |
| parent | 8cd7329c91b047ef15c81b164075ea6c1d15b0df (diff) | |
| parent | dfbdb99858ee6553c50e92cb20354b6ed60094d8 (diff) | |
| download | tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.gz tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.bz2 tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.lz tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.xz tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.tar.zst tangerine-wallet-browser-d9c92cdbd170e40622f081c2d45edaf970280954.zip | |
Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/keyring-controller-test.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js index 34c314639..135edf365 100644 --- a/test/unit/keyring-controller-test.js +++ b/test/unit/keyring-controller-test.js @@ -27,12 +27,9 @@ describe('KeyringController', function () { 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 |