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

working on refactor

Browse source
This commit is contained in:
Manuel Araoz 2014-06-17 16:42:49 -03:00
commit 27de2896d8
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,17 +120,10 @@ Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
this.log('RECV TXPROPOSAL:', data);
var recipients;
var inTxp = TxProposals.fromObj(data.txProposals);
var ids = inTxp.getNtxids();
var inTxp = TxProposal.fromObj(data.txProposal);
if (ids.length > 1) {
this.emit('badMessage', senderId);
this.log('Received BAD TxProposal messsage FROM:', senderId); //TODO
return;
}
var newId = ids[0];
var mergeInfo = this.txProposals.merge(inTxp, true);
var newId = inTxp.getID();
var mergeInfo = this.txProposals.merge(inTxp);
var addSeen = this.addSeenToTxProposals();
if (mergeInfo.hasChanged || addSeen) {
this.log('### BROADCASTING txProposals. ');