Merge pull request #445 from matiu/feat/invalid-txs

ignore invalid TXs

lib/server.js

@@ -2202,6 +2202,7 @@ WalletService.prototype.getTxHistory = function(opts, cb) {
       } else {
         action = 'invalid';
         amount = 0;
+        log.warn("Got Invalid TX from address:", JSON.stringify(tx));
       }
 
       function outputMap(o) {
@@ -2282,6 +2283,7 @@ WalletService.prototype.getTxHistory = function(opts, cb) {
       var txs = res[1];
 
       txs = decorate(txs, addresses, proposals);
+      txs = _.filter(txs, function(tx) { return tx.action != 'invalid' })
 
       return cb(null, txs);
     });

test/integration/server.js

@@ -4816,7 +4816,7 @@ describe('Wallet service', function() {
         done();
       });
     });
-    it('should handle invalid tx in  history ', function(done) {
+    it('should handle filter out invalid txs in  history ', function(done) {
       var h = _.clone(TestData.history);
       h.push({
         txid: 'xx'
@@ -4827,8 +4827,7 @@ describe('Wallet service', function() {
       server.getTxHistory({}, function(err, txs) {
         should.not.exist(err);
         should.exist(txs);
-        txs.length.should.equal(l + 1);
+        txs.length.should.equal(l);
-        txs[l].action.should.equal('invalid');
         done();
       });
     });