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 /test | |
| parent | 73d9434ad63e18a87bd3ed13a285eb37c9c6ae7c (diff) | |
| parent | 4c971ebfd1fad18368ec418c36c4d05a6bb37e6d (diff) | |
| download | tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.tar tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.tar.gz tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.tar.bz2 tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.tar.lz tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.tar.xz tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.tar.zst tangerine-wallet-browser-95afdfe3685a2e666510e203f7d9d7607e703006.zip | |
Merge pull request #2145 from MetaMask/ConfigurableEncryption
Configurable encryption
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 2d9a53723..8d0d75f12 100644 --- a/test/unit/keyring-controller-test.js +++ b/test/unit/keyring-controller-test.js @@ -27,12 +27,9 @@ describe('KeyringController', function () { ethStore: { 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 |