Testing transform simplification

Micah Riggan · Micah Riggan · commit dba11ac2ae03 · 2018-07-13T16:15:42.000-04:00
diff --git a/packages/bitcore-node/src/providers/chain-state/internal/transforms.js b/packages/bitcore-node/src/providers/chain-state/internal/transforms.js
@@ -1,94 +1,72 @@
 const { CoinModel } = require('../../../models/coin');
 const {Transform} = require('stream');
 const util = require('util');
-const _ = require('underscore');
 
 function ListTransactionsStream(wallet) {
   this.wallet = wallet;
-  Transform.call(this, {objectMode: true});
+  Transform.call(this, { objectMode: true });
 }
-
 util.inherits(ListTransactionsStream, Transform);
-
-ListTransactionsStream.prototype._transform = async function(transaction, enc, done) {
+ListTransactionsStream.prototype._transform = function (transaction, enc, done) {
   var self = this;
-  transaction.inputs = await CoinModel.collection.find({
-    chain: transaction.chain,
-    network: transaction.network,
-    spentTxid: transaction.txid
-  }, { batchSize: 100 }).toArray();
-  transaction.outputs = await CoinModel.collection.find({
-    chain: transaction.chain,
-    network: transaction.network,
-    mintTxid: transaction.txid
-  }, { batchSize: 100 }).toArray();
+  return Promise.all([
+    CoinModel.collection.find({
+      chain: transaction.chain,
+      network: transaction.network,
+      spentTxid: transaction.txid
+    }, { batchSize: 100 }).toArray(),
+    CoinModel.collection.find({
+      chain: transaction.chain,
+      network: transaction.network,
+      mintTxid: transaction.txid
+    }, { batchSize: 100 }).toArray()])
+    .then(([inputs, outputs]) => {
 
-  var wallet = this.wallet._id.toString();
-  var totalInputs = transaction.inputs.reduce((total, input) => { return total + input.value; }, 0);
-  var totalOutputs = transaction.outputs.reduce((total, output) => { return total + output.value; }, 0);
-  var fee = totalInputs - totalOutputs;
-  var sending = _.some(transaction.inputs, function(input) {
-    var contains = false;
-    _.each(input.wallets, function(inputWallet) {
-      if(inputWallet.equals(wallet)) {
-        contains = true;
-      }
-    });
-    return contains;
-  });
+      transaction.inputs = inputs;
+      transaction.outputs = outputs;
+      var wallet = this.wallet._id;
+      var totalInputs = transaction.inputs.reduce((total, input) => { return total + input.value; }, 0);
+      var totalOutputs = transaction.outputs.reduce((total, output) => { return total + output.value; }, 0);
+      var fee = totalInputs - totalOutputs;
+
+      for(let input of transaction.inputs) {
+        if (input.wallets.includes(wallet)) {
+          self.push(JSON.stringify({
+            txid: transaction.txid,
+            category: 'send',
+            satoshis: -input.value,
+            height: transaction.blockHeight,
+            address: input.address,
+            outputIndex: input.vout,
+            blockTime: transaction.blockTimeNormalized
+          }) + '\n');
 
-  if(sending) {
-    _.each(transaction.outputs, function(output) {
-      var contains = false;
-      _.each(output.wallets, function(outputWallet) {
-        if(outputWallet.equals(wallet)) {
-          contains = true;
+          if (fee > 0) {
+            self.push(JSON.stringify({
+              txid: transaction.txid,
+              category: 'fee',
+              satoshis: -fee,
+              height: transaction.blockHeight,
+              blockTime: transaction.blockTimeNormalized
+            }) + '\n');
+          }
         }
-      });
-      if(!contains) {
-        self.push(JSON.stringify({
-          txid: transaction.txid,
-          category: 'send',
-          satoshis: -output.value,
-          height: transaction.blockHeight,
-          address: output.address,
-          outputIndex: output.vout,
-          blockTime: transaction.blockTimeNormalized
-        }) + '\n');
       }
-    });
-    if(fee > 0) {
-      self.push(JSON.stringify({
-        txid: transaction.txid,
-        category: 'fee',
-        satoshis: -fee,
-        height: transaction.blockHeight,
-        blockTime: transaction.blockTimeNormalized
-      }) + '\n');
-    }
-    return done();
-  }
-
-  _.each(transaction.outputs, function(output) {
-    var contains = false;
-    _.each(output.wallets, function(outputWallet) {
-      if(outputWallet.equals(wallet)) {
-        contains = true;
+      for(let output of transaction.outputs) {
+        if (output.wallets.includes(output)) {
+          self.push(JSON.stringify({
+            txid: transaction.txid,
+            category: 'receive',
+            satoshis: output.value,
+            height: transaction.blockHeight,
+            address: output.address,
+            outputIndex: output.vout,
+            blockTime: transaction.blockTimeNormalized
+          }) + '\n');
+        }
       }
-    });
-    if(contains) {
-      self.push(JSON.stringify({
-        txid: transaction.txid,
-        category: 'receive',
-        satoshis: output.value,
-        height: transaction.blockHeight,
-        address: output.address,
-        outputIndex: output.vout,
-        blockTime: transaction.blockTimeNormalized
-      }) + '\n');
-    }
-  });
-  done();
+    })
+    .then(() => done())
+    .catch((err) => done(err));
 };
-
 module.exports = ListTransactionsStream;
