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

network handler refactor, remove 'close'

This commit is contained in:
Manuel Araoz 2014-08-19 10:25:03 -04:00
parent 28e00b24cc
commit 605e2c7d49
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ Wallet.prototype.connectToAll = function() {
} }
}; };
Wallet.prototype._handleIndexes = function(senderId, data, isInbound) { Wallet.prototype._onIndexes = function(senderId, data, isInbound) {
this.log('RECV INDEXES:', data); this.log('RECV INDEXES:', data);
var inIndexes = HDParams.fromList(data.indexes); var inIndexes = HDParams.fromList(data.indexes);
var hasChanged = this.publicKeyRing.mergeIndexes(inIndexes); var hasChanged = this.publicKeyRing.mergeIndexes(inIndexes);
@ -109,7 +109,7 @@ Wallet.prototype._handleIndexes = function(senderId, data, isInbound) {
} }
}; };
Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) { Wallet.prototype._onPublicKeyRing = function(senderId, data, isInbound) {
this.log('RECV PUBLICKEYRING:', data); this.log('RECV PUBLICKEYRING:', data);
var inPKR = PublicKeyRing.fromObj(data.publicKeyRing); var inPKR = PublicKeyRing.fromObj(data.publicKeyRing);
@ -217,7 +217,7 @@ Wallet.prototype._checkSentTx = function(ntxid, cb) {
}; };
Wallet.prototype._handleTxProposal = function(senderId, data) { Wallet.prototype._onTxProposal = function(senderId, data) {
var self = this; var self = this;
this.log('RECV TXPROPOSAL: ', data); this.log('RECV TXPROPOSAL: ', data);
var m; var m;
@ -254,7 +254,7 @@ Wallet.prototype._handleTxProposal = function(senderId, data) {
}; };
Wallet.prototype._handleReject = function(senderId, data, isInbound) { Wallet.prototype._onReject = function(senderId, data, isInbound) {
preconditions.checkState(data.ntxid); preconditions.checkState(data.ntxid);
this.log('RECV REJECT:', data); this.log('RECV REJECT:', data);
@ -277,7 +277,7 @@ Wallet.prototype._handleReject = function(senderId, data, isInbound) {
}); });
}; };
Wallet.prototype._handleSeen = function(senderId, data, isInbound) { Wallet.prototype._onSeen = function(senderId, data, isInbound) {
preconditions.checkState(data.ntxid); preconditions.checkState(data.ntxid);
this.log('RECV SEEN:', data); this.log('RECV SEEN:', data);
@ -295,7 +295,7 @@ Wallet.prototype._handleSeen = function(senderId, data, isInbound) {
Wallet.prototype._handleAddressBook = function(senderId, data, isInbound) { Wallet.prototype._onAddressBook = function(senderId, data, isInbound) {
preconditions.checkState(data.addressBook); preconditions.checkState(data.addressBook);
this.log('RECV ADDRESSBOOK:', data); this.log('RECV ADDRESSBOOK:', data);
var rcv = data.addressBook; var rcv = data.addressBook;
@ -315,7 +315,7 @@ Wallet.prototype._handleAddressBook = function(senderId, data, isInbound) {
} }
}; };
Wallet.prototype._handleData = function(senderId, data, isInbound) { Wallet.prototype._onData = function(senderId, data, isInbound) {
preconditions.checkArgument(senderId); preconditions.checkArgument(senderId);
preconditions.checkArgument(data); preconditions.checkArgument(data);
preconditions.checkArgument(data.type); preconditions.checkArgument(data.type);
@ -337,27 +337,27 @@ Wallet.prototype._handleData = function(senderId, data, isInbound) {
this.sendAllTxProposals(senderId); // send old txps this.sendAllTxProposals(senderId); // send old txps
break; break;
case 'publicKeyRing': case 'publicKeyRing':
this._handlePublicKeyRing(senderId, data, isInbound); this._onPublicKeyRing(senderId, data, isInbound);
break; break;
case 'reject': case 'reject':
this._handleReject(senderId, data, isInbound); this._onReject(senderId, data, isInbound);
break; break;
case 'seen': case 'seen':
this._handleSeen(senderId, data, isInbound); this._onSeen(senderId, data, isInbound);
break; break;
case 'txProposal': case 'txProposal':
this._handleTxProposal(senderId, data, isInbound); this._onTxProposal(senderId, data, isInbound);
break; break;
case 'indexes': case 'indexes':
this._handleIndexes(senderId, data, isInbound); this._onIndexes(senderId, data, isInbound);
break; break;
case 'addressbook': case 'addressbook':
this._handleAddressBook(senderId, data, isInbound); this._onAddressBook(senderId, data, isInbound);
break; break;
} }
}; };
Wallet.prototype._handleConnect = function(newCopayerId) { Wallet.prototype._onConnect = function(newCopayerId) {
if (newCopayerId) { if (newCopayerId) {
this.log('#### Setting new COPAYER:', newCopayerId); this.log('#### Setting new COPAYER:', newCopayerId);
this.sendWalletId(newCopayerId); this.sendWalletId(newCopayerId);
@ -366,7 +366,7 @@ Wallet.prototype._handleConnect = function(newCopayerId) {
this.emit('connect', peerID); this.emit('connect', peerID);
}; };
Wallet.prototype._handleDisconnect = function(peerID) { Wallet.prototype._onDisconnect = function(peerID) {
this.currentDelay = null; this.currentDelay = null;
this.emit('disconnect', peerID); this.emit('disconnect', peerID);
}; };
@ -428,12 +428,9 @@ Wallet.prototype.netStart = function(callback) {
var net = this.network; var net = this.network;
net.removeAllListeners(); net.removeAllListeners();
net.on('connect', self._handleConnect.bind(self)); net.on('connect', self._onConnect.bind(self));
net.on('disconnect', self._handleDisconnect.bind(self)); net.on('disconnect', self._onDisconnect.bind(self));
net.on('data', self._handleData.bind(self)); net.on('data', self._onData.bind(self));
net.on('close', function() {
self.emit('close');
});
net.on('serverError', function(msg) { net.on('serverError', function(msg) {
self.emit('serverError', msg); self.emit('serverError', msg);
}); });