From 78933f882111912a5da628b242b223b12a417080 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 25 Nov 2014 17:44:51 -0300
Subject: [PATCH] lodash on loop

---
 js/models/Wallet.js | 22 +++++++++++-----------
 test/Wallet.js      | 28 ++++++++++++++--------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/js/models/Wallet.js b/js/models/Wallet.js
index 19c5be1ec..66ceb9c80 100644
--- a/js/models/Wallet.js
+++ b/js/models/Wallet.js
@@ -598,7 +598,9 @@ Wallet.prototype._onReject = function(senderId, data) {
 
   try {
     var txp = this.txProposals.get(data.ntxid);
-  } catch (e) {};
+  } catch (e) {
+    log.info(e);
+  };
 
   if (txp) {
     if (txp.signedBy[senderId])
@@ -1401,22 +1403,20 @@ Wallet.prototype.generateAddress = function(isChange, cb) {
  */
 Wallet.prototype.getTxProposals = function() {
   var ret = [];
-  var copayers = this.getRegisteredCopayerIds();
-  for (var ntxid in this.txProposals.txps) {
-    var txp = this.txProposals.getTxProposal(ntxid, copayers);
+  var self = this;
+  var copayers = self.getRegisteredCopayerIds();
+  var myId = self.getMyCopayerId();
 
-    txp.signedByUs = txp.signedBy[this.getMyCopayerId()] ? true : false;
-    txp.rejectedByUs = txp.rejectedBy[this.getMyCopayerId()] ? true : false;
-    txp.finallyRejected = this.totalCopayers - txp.rejectCount < this.requiredCopayers;
+  _.each(self.txProposals.txps, function(txp, ntxid){ 
+    txp.signedByUs = txp.signedBy[myId] ? true : false;
+    txp.rejectedByUs = txp.rejectedBy[self.getMyCopayerId()] ? true : false;
+    txp.finallyRejected = self.totalCopayers - txp.rejectCount < self.requiredCopayers;
     txp.isPending = !txp.finallyRejected && !txp.sentTxid;
 
-    // si no gastada
-    // y si no esta expirada;
-
     if (!txp.readonly || txp.finallyRejected || txp.sentTs) {
       ret.push(txp);
     }
-  }
+  });
   return ret;
 };
 
diff --git a/test/Wallet.js b/test/Wallet.js
index f534ccfc0..71dd56044 100644
--- a/test/Wallet.js
+++ b/test/Wallet.js
@@ -972,7 +972,7 @@ describe('Wallet model', function() {
         done();
       });
     });
- 
+
 
     it('should send Payment Messages on a PayPro payment', function(done) {
       var w = createW2(null, 1);
@@ -1895,13 +1895,13 @@ describe('Wallet model', function() {
 
 
   describe('_onReject', function() {
-    it('should fails if unknown tx', function() {
+    it('should do nothing on unknown tx', function() {
       var w = cachedCreateW();
-      (function() {
-        w._onReject(1, {
-          ntxid: 1
-        }, 1);
-      }).should.throw('Unknown TXP');
+      var spy1 = sinon.spy(w, 'emitAndKeepAlive');
+      w._onReject(1, {
+        ntxid: 1
+      }, 1);
+      spy1.called.should.equal(false);
     });
     it('should fail to reject a signed tx', function() {
       var w = cachedCreateW();
@@ -1949,13 +1949,13 @@ describe('Wallet model', function() {
 
 
   describe('_onSeen', function() {
-    it('should fails if unknown tx', function() {
+    it('should do nothing on unknown tx', function() {
       var w = cachedCreateW();
-      (function() {
-        w._onReject(1, {
-          ntxid: 1
-        }, 1);
-      }).should.throw('Unknown TXP');
+      var spy1 = sinon.spy(w, 'emitAndKeepAlive');
+      w._onReject(1, {
+        ntxid: 1
+      }, 1);
+      spy1.called.should.equal(false);
     });
     it('should set seen a tx', function() {
       var w = cachedCreateW();
@@ -2458,7 +2458,7 @@ describe('Wallet model', function() {
   describe.skip('#onPayProPaymentAck', function() {
     it('should emit', function() {
       var w = cachedCreateW2();
-      sinon.stub(w,'emitAndKeepAlive');
+      sinon.stub(w, 'emitAndKeepAlive');
       w.onPayProPaymentAck('id', 'data');
 
       w.calledOnce.should.equal(true);