anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

trying to fix tests

Browse source
This commit is contained in:
Manuel Araoz 2014-06-12 14:27:53 -03:00
commit 322a793b62
5 changed files with 35 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/models/core/PrivateKey.js
View file

@ -58,7 +58,8 @@ PrivateKey.prototype._getHK = function(path) {
if (typeof path === 'undefined') {
return this.bip;
}
return this.bip.derive(path);
var ret = this.bip.derive(path);
return ret;
};
PrivateKey.prototype.getForPaths = function(paths) {

1
js/models/core/PublicKeyRing.js
View file

@ -151,6 +151,7 @@ PublicKeyRing.prototype.getPubKeys = function(index, isChange) {
pubKeys = pubKeys.map(function(s){return new Buffer(s,'hex');});
}
return pubKeys;
};

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

@ -92,7 +92,7 @@ Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) {
try{
hasChanged = this.publicKeyRing.merge(inPKR, true);
} catch (e){
console.log('## WALLET ERROR', e); //TODO
this.log('## WALLET ERROR', e); //TODO
this.emit('connectionError', e.message);
return;
}