This commit is contained in:
Matias Alejo Garcia 2014-08-13 10:16:07 -04:00
parent 35ab711846
commit 33ac84bc49
1 changed files with 3 additions and 5 deletions

View File

@ -134,7 +134,7 @@ Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) {
try { try {
hasChanged = this.publicKeyRing.merge(inPKR, true); hasChanged = this.publicKeyRing.merge(inPKR, true);
} catch (e) { } catch (e) {
this.log('## WALLET ERROR', e); //TODO this.log('## WALLET ERROR', e);
this.emit('connectionError', e.message); this.emit('connectionError', e.message);
return; return;
} }
@ -328,9 +328,10 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
if (data.type !== 'walletId' && this.id !== data.walletId) { if (data.type !== 'walletId' && this.id !== data.walletId) {
this.emit('badMessage', senderId); this.emit('badMessage', senderId);
this.log('badMessage FROM:', senderId); //TODO this.log('badMessage FROM:', senderId);
return; return;
} }
switch (data.type) { switch (data.type) {
// This handler is repeaded on WalletFactory (#join). TODO // This handler is repeaded on WalletFactory (#join). TODO
case 'walletId': case 'walletId':
@ -433,8 +434,6 @@ Wallet.prototype.netStart = function(callback) {
var net = this.network; var net = this.network;
if (this.checkAndLock() && !this.ignoreLock) { if (this.checkAndLock() && !this.ignoreLock) {
console.log('[Wallet.js.436] LOCKED' ); //TODO
this.emit('locked'); this.emit('locked');
return; return;
} }
@ -752,7 +751,6 @@ Wallet.prototype.sendTx = function(ntxid, cb) {
} else { } else {
self.log('Sent failed. Checking is the TX was sent already'); self.log('Sent failed. Checking is the TX was sent already');
self._checkSentTx(ntxid, function(txid) { self._checkSentTx(ntxid, function(txid) {
console.log('[Wallet.js.730:txid:]', txid); //TODO
if (txid) if (txid)
self.store(); self.store();