Merge branch '1.0' into docs/improvements

web3 · Apr 4, 2019 · 4a3a685 · 4a3a685
2 parents 65fa651 + 340d621
commit 4a3a685
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/web3-eth-accounts/src/models/Wallet.js b/packages/web3-eth-accounts/src/models/Wallet.js
@@ -160,7 +160,7 @@ export default class Wallet {
     encrypt(password, options) {
         let encryptedAccounts = [];
 
-        for (let i = 0; i <= this.accountsIndex; i++) {
+        for (let i = 0; i < this.accountsIndex; i++) {
             encryptedAccounts.push(this.accounts[i].encrypt(password, options));
         }
 
@@ -249,9 +249,7 @@ export default class Wallet {
             keystore = localStorage.getItem(keyName || this.defaultKeyName);
 
             if (keystore) {
-                keystore = JSON.parse(keystore).map((item) => {
-                    Account.fromV3Keystore(item, password, false, this.accountsModule);
-                });
+                keystore = JSON.parse(keystore);
             }
         } catch (error) {
             // code 18 means trying to use local storage in a iframe

diff --git a/packages/web3-eth-accounts/tests/src/models/WalletTest.js b/packages/web3-eth-accounts/tests/src/models/WalletTest.js
@@ -139,12 +139,13 @@ describe('WalletTest', () => {
         accountMock.encrypt.mockReturnValueOnce(true);
 
         wallet.accounts[0] = accountMock;
+        wallet.accountsIndex = 1;
 
         expect(wallet.encrypt('pw', {})).toEqual([true]);
 
         expect(accountMock.encrypt).toHaveBeenCalledWith('pw', {});
 
-        expect(wallet.accountsIndex).toEqual(0);
+        expect(wallet.accountsIndex).toEqual(1);
     });
 
     it('calls decrypt and returns the expected value', () => {