Merge pull request #1692 from LiskHQ/1662-Review_unit_test_coverage_f…

…or_logic_transaction_pool Review unit test coverage for logic transaction pool - Closes #1662
LiskArchive · Mar 14, 2018 · 0e8483a · 0e8483a
2 parents 0d398db + 6c963a9
commit 0e8483a
Show file tree

Hide file tree

Showing 2 changed files with 1,419 additions and 337 deletions.
diff --git a/logic/transaction_pool.js b/logic/transaction_pool.js
@@ -265,7 +265,7 @@ TransactionPool.prototype.getMultisignatureTransactionList = function(
  * @param {boolean} reverse - Reverse order of results
  * @param {number} limit - Limit applied to results
  * @returns {Object[]} Of unconfirmed, multisignatures, queued transactions
- * @todo Limit is only implemented with queued transactions
+ * @todo Limit is only implemented with queued transactions, reverse param is unused
  */
 TransactionPool.prototype.getMergedTransactionList = function(reverse, limit) {
 	const minLimit = constants.maxTxsPerBlock + 2;
@@ -289,7 +289,7 @@ TransactionPool.prototype.getMergedTransactionList = function(reverse, limit) {
 	const queued = self.getQueuedTransactionList(false, limit);
 	limit -= queued.length;
 
-	return unconfirmed.concat(multisignatures).concat(queued);
+	return [...unconfirmed, ...multisignatures, ...queued];
 };
 
 /**
@@ -731,20 +731,21 @@ TransactionPool.prototype.fillPool = function(cb) {
 	}
 	let spare = 0;
 	const multisignaturesLimit = 5;
-	let transactions;
 
 	spare = constants.maxTxsPerBlock - unconfirmedCount;
 	const spareMulti = spare >= multisignaturesLimit ? multisignaturesLimit : 0;
 	const multisignatures = self
 		.getMultisignatureTransactionList(true, multisignaturesLimit, true)
 		.slice(0, spareMulti);
 	spare = Math.abs(spare - multisignatures.length);
-	transactions = self
+	const queuedTransactions = self
 		.getQueuedTransactionList(true, constants.maxTxsPerBlock)
 		.slice(0, spare);
-	transactions = multisignatures.concat(transactions);
 
-	return __private.applyUnconfirmedList(transactions, cb);
+	return __private.applyUnconfirmedList(
+		[...multisignatures, ...queuedTransactions],
+		cb
+	);
 };
 
 /**
@@ -1001,7 +1002,7 @@ __private.expireTransactions = function(transactions, parentIds, cb) {
 			}
 			return setImmediate(eachSeriesCb);
 		},
-		err => setImmediate(cb, err, ids.concat(parentIds))
+		err => setImmediate(cb, err, [...ids, ...parentIds])
 	);
 };