BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add setFromObj to FakeStorage - and fix publicKeyring capitalization 

...to fix tests
This commit is contained in:
Ryan X. Charles 2014-04-17 18:55:17 -03:00
parent 9319c7f93f
commit 4681783231
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/models/core/Wallet.js
View File

@ -166,7 +166,7 @@ Wallet.prototype.toObj = function() {
var optsObj = this._optsToObj();
var walletObj = {
opts: optsObj,
publicKeyring: this.publicKeyRing.toObj(),
publicKeyRing: this.publicKeyRing.toObj(),
txProposals: this.txProposals.toObj(),
privateKey: this.privateKey.toObj()
};

4
js/models/core/WalletFactory.js
View File

@ -48,11 +48,13 @@ WalletFactory.prototype._checkRead = function(walletId) {
};
WalletFactory.prototype.read = function(walletId) {
if (! this._checkRead(walletId)) return false;
if (! this._checkRead(walletId))
throw Error('Check read failed');
var s = this.storage;
var opts = s.get(walletId, 'opts');
opts.id = walletId;
opts.publicKeyRing = new PublicKeyRing.fromObj(s.get(walletId, 'publicKeyRing'));
opts.txProposals = new TxProposals.fromObj(s.get(walletId, 'txProposals'));
opts.privateKey = new PrivateKey.fromObj(s.get(walletId, 'privateKey'));

6
test/mocks/FakeStorage.js
View File

@ -27,4 +27,10 @@ FakeStorage.prototype.getWalletIds = function() {
return [];
};
FakeStorage.prototype.setFromObj = function(walletId, obj) {
for (var i in obj) {
this.storage[walletId + '-' + i] = obj[i];
};
};
module.exports = require('soop')(FakeStorage);