mocha test passing on console

js/models/core/Wallet.js

@@ -1670,7 +1670,7 @@ Wallet.prototype.indexDiscovery = function(start, change, cosigner, gap, cb) {
 
 Wallet.prototype.disconnect = function() {
   this.log('## DISCONNECTING');
-  this.unlock();
+  this.lock.release();
   this.network.disconnect();
 };
 

js/models/core/WalletFactory.js

@@ -170,7 +170,7 @@ WalletFactory.prototype._checkNetwork = function(inNetworkName) {
 
 WalletFactory.prototype.open = function(walletId, passphrase) {
   this.storage._setPassphrase(passphrase);
-  var w = this.read(walletId, opts);
+  var w = this.read(walletId);
   if (w) 
     w.store();
 

js/models/storage/LocalEncrypted.js

@@ -141,7 +141,7 @@ Storage.prototype.getWalletIds = function() {
     if (split.length == 2) {
       var walletId = split[0];
 
-      if (walletId === 'nameFor' || walletId === 'lock') 
+      if (!walletId || walletId === 'nameFor') 
         continue;
 
       if (typeof uniq[walletId] === 'undefined') {
@@ -190,19 +190,6 @@ Storage.prototype.getLastOpened = function() {
   return this.getGlobal('lastOpened');
 }
 
-// Lock related
-Storage.prototype.setLock = function(walletId) {
-  this.setGlobal(this._key(walletId, 'Lock'), this.sessionId());
-}
-
-Storage.prototype.getLock = function(walletId) {
-  return this.getGlobal(this._key(walletId, 'Lock'));
-}
-
-Storage.prototype.removeLock = function(walletId) {
-  this.removeGlobal(this._key(walletId, 'Lock'));
-}
-
 //obj contains keys to be set
 Storage.prototype.setFromObj = function(walletId, obj) {
   for (var k in obj) {

test/mocks/FakeStorage.js

@@ -69,7 +69,11 @@ FakeStorage.prototype.getWalletIds = function() {
     var split = ii.split('::');
     if (split.length == 2) {
       var walletId = split[0];
-      if (walletId !== 'nameFor' && typeof uniq[walletId] === 'undefined') {
+
+      if (!walletId || walletId === 'nameFor' || walletId ==='lock') 
+        continue;
+
+      if (typeof uniq[walletId] === 'undefined') {
         walletIds.push(walletId);
         uniq[walletId] = 1;
       }

test/test.LocalEncrypted.js

@@ -1,14 +1,17 @@
 'use strict';
-var copay = copay || require('../copay');
 var chai = chai || require('chai');
 var should = chai.should();
-var LocalEncrypted = copay.StorageLocalEncrypted;
-
-
 var fakeWallet = 'fake-wallet-id';
 var timeStamp = Date.now();
 var localMock = require('./mocks/FakeLocalStorage');
+var is_browser = typeof process == 'undefined' || typeof process.versions === 'undefined';
 
+if (is_browser) {
+  var copay = require('copay'); //browser
+} else {
+  var copay = require('../copay'); //node
+}
+var LocalEncrypted = copay.StorageLocalEncrypted;
 
 describe('Storage/LocalEncrypted model', function() {
   var s = new LocalEncrypted({
@@ -22,24 +25,26 @@ describe('Storage/LocalEncrypted model', function() {
     });
     should.exist(s2);
   });
-  it('should fail when encrypting without a password', function() {
+});
+
+it('should fail when encrypting without a password', function() {
   var s2 = new LocalEncrypted({
     localStorage: localMock,
   });
   (function() {
     s2.set(fakeWallet, timeStamp, 1);
   }).should.throw();
-  });
+});
-  it('should be able to encrypt and decrypt', function() {
+it('should be able to encrypt and decrypt', function() {
   s._write(fakeWallet + timeStamp, 'value');
   s._read(fakeWallet + timeStamp).should.equal('value');
   localMock.removeItem(fakeWallet + timeStamp);
-  });
+});
-  it('should be able to set a value', function() {
+it('should be able to set a value', function() {
   s.set(fakeWallet, timeStamp, 1);
   localMock.removeItem(fakeWallet + '::' + timeStamp);
-  });
+});
-  var getSetData = [
+var getSetData = [
   1, 1000, -15, -1000,
   0.1, -0.5, -0.5e-10, Math.PI,
   'hi', 'auydoaiusyodaisudyoa', '0b5b8556a0c2ce828c9ccfa58b3dd0a1ae879b9b',
@@ -55,17 +60,17 @@ describe('Storage/LocalEncrypted model', function() {
     c: [1, 2, 'hi']
   },
   null
-  ];
+];
-  getSetData.forEach(function(obj) {
+getSetData.forEach(function(obj) {
   it('should be able to set a value and get it for ' + JSON.stringify(obj), function() {
     s.set(fakeWallet, timeStamp, obj);
     var obj2 = s.get(fakeWallet, timeStamp);
     JSON.stringify(obj2).should.equal(JSON.stringify(obj));
     localMock.removeItem(fakeWallet + '::' + timeStamp);
   });
-  });
+});
 
-  describe('#export', function() {
+describe('#export', function() {
   it('should export the encrypted wallet', function() {
     var storage = new LocalEncrypted({
       localStorage: localMock,
@@ -80,9 +85,21 @@ describe('Storage/LocalEncrypted model', function() {
     localMock.removeItem(fakeWallet + '::' + timeStamp);
     //encrypted.slice(0,6).should.equal("53616c");
   });
+});
+describe('#_decryptObj', function() {
+  it('should decrypt and Obj', function() {
+    var storage = new LocalEncrypted({
+      password: 'password',
+      localStorage: localMock,
     });
+    storage._decryptObj('{"a":"2"}').should.deep.equal({
+      a: "2"
+    });
+  });
+});
 
-  describe('#remove', function() {
+
+describe('#remove', function() {
   it('should remove an item', function() {
     var s = new LocalEncrypted({
       localStorage: localMock,
@@ -94,10 +111,10 @@ describe('Storage/LocalEncrypted model', function() {
 
     should.not.exist(s.get('1', 'hola'));
   });
-  });
+});
 
 
-  describe('#getWalletIds', function() {
+describe('#getWalletIds', function() {
   it('should get wallet ids', function() {
     var s = new LocalEncrypted({
       localStorage: localMock,
@@ -107,9 +124,9 @@ describe('Storage/LocalEncrypted model', function() {
     s.set('2', "hola", 'juan');
     s.getWalletIds().should.deep.equal(['1', '2']);
   });
-  });
+});
 
-  describe('#getName #setName', function() {
+describe('#getName #setName', function() {
   it('should get/set names', function() {
     var s = new LocalEncrypted({
       localStorage: localMock,
@@ -118,9 +135,9 @@ describe('Storage/LocalEncrypted model', function() {
     s.setName(1, 'hola');
     s.getName(1).should.equal('hola');
   });
-  });
+});
 
-  describe('#getLastOpened #setLastOpened', function() {
+describe('#getLastOpened #setLastOpened', function() {
   it('should get/set names', function() {
     var s = new LocalEncrypted({
       localStorage: localMock,
@@ -129,22 +146,24 @@ describe('Storage/LocalEncrypted model', function() {
     s.setLastOpened('hey');
     s.getLastOpened().should.equal('hey');
   });
-  });
+});
 
-  describe('#WalletLock', function() {
+if (is_browser) {
-    it('should get/set/remove opened', function() {
+  describe('#getSessionId', function() {
+    it('should get SessionId', function() {
       var s = new LocalEncrypted({
         localStorage: localMock,
         password: 'password'
       });
-      s.setLock('walletId');
+      var sid = s.getSessionId();
-      s.getLock('walletId').should.equal(true);
+      should.exist(sid);
-      s.removeLock('walletId');
+      var sid2 = s.getSessionId();
-      should.not.exist(s.getLock('walletId'));
+      sid2.should.equal(sid);
     });
   });
+}
 
-  describe('#getWallets', function() {
+describe('#getWallets', function() {
   it('should retreive wallets from storage', function() {
     var s = new LocalEncrypted({
       localStorage: localMock,
@@ -162,8 +181,8 @@ describe('Storage/LocalEncrypted model', function() {
       name: undefined
     });
   });
-  });
+});
-  describe('#deleteWallet', function() {
+describe('#deleteWallet', function() {
   it('should delete a wallet', function() {
     var s = new LocalEncrypted({
       localStorage: localMock,
@@ -180,9 +199,9 @@ describe('Storage/LocalEncrypted model', function() {
       name: undefined
     });
   });
-  });
+});
 
-  describe('#setFromObj', function() {
+describe('#setFromObj', function() {
   it('set localstorage from an object', function() {
     var s = new LocalEncrypted({
       localStorage: localMock,
@@ -198,10 +217,10 @@ describe('Storage/LocalEncrypted model', function() {
     s.get('id1', 'key').should.equal('val');
 
   });
-  });
+});
 
 
-  describe('#globals', function() {
+describe('#globals', function() {
   it('should set, get and remove keys', function() {
     var s = new LocalEncrypted({
       localStorage: localMock,
@@ -216,5 +235,4 @@ describe('Storage/LocalEncrypted model', function() {
     s.removeGlobal('a');
     should.not.exist(s.getGlobal('a'));
   });
-  });
 });

test/test.Wallet.js

@@ -1024,22 +1024,6 @@ describe('Wallet model', function() {
       w.network.start.getCall(0).args[0].privkey.length.should.equal(64);
     });
 
-    it('should not start if locked', function() {
-      var w = cachedCreateW2();
-      w.netStart();
-      w.emit = sinon.spy();
-      w.netStart();
-      w.emit.getCall(0).args[0].should.equal('locked');
-    });
-
-    it('should accept ignoreLocked', function() {
-      var w = cachedCreateW2();
-      w.netStart();
-      w.network.start = sinon.spy();
-      w.ignoreLock=1;
-      w.netStart();
-      w.network.start.getCall(0).args[0].privkey.length.should.equal(64);
-    });
   });
 
   describe('#forceNetwork in config', function() {

test/test.WalletFactory.js

@@ -298,6 +298,7 @@ describe('WalletFactory model', function() {
     var w = wf.create({
       name: 'test wallet'
     });
+
     ws = wf.getWallets();
     ws.length.should.equal(1);
     ws[0].name.should.equal('test wallet');