Merge pull request #1927 from matiu/bug/wallet2

Add more tests to Wallet.js
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-02 18:15:08 -03:00
commit baa4cc0a24
3 changed files with 65 additions and 14 deletions

View file

@ -327,8 +327,7 @@ Wallet.prototype._onPublicKeyRing = function(senderId, data) {
try {
hasChanged = this.publicKeyRing.merge(inPKR, true);
} catch (e) {
log.debug('Wallet:' + this.id + '## WALLET ERROR', e);
this.emitAndKeepAlive('connectionError', e.message);
log.warn('Wallet:' + this.id, e);
return;
}
if (hasChanged) {