From 5815752525b68eecad970a18ea6b817e6de215a8 Mon Sep 17 00:00:00 2001
From: Dmitry Tyshchenko <rainydio@gmail.com>
Date: Tue, 24 Aug 2021 16:54:19 +0300
Subject: [PATCH] Extract entryId variable (#4471)

---
 .../core-transaction-pool/src/processor.ts    | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/core-transaction-pool/src/processor.ts b/packages/core-transaction-pool/src/processor.ts
index 619dace567..6e47378d76 100644
--- a/packages/core-transaction-pool/src/processor.ts
+++ b/packages/core-transaction-pool/src/processor.ts
@@ -1,4 +1,4 @@
-import { Container, Contracts, Utils as AppUtils } from "@arkecosystem/core-kernel";
+import { Container, Contracts } from "@arkecosystem/core-kernel";
 import { Enums, Interfaces, Transactions } from "@arkecosystem/crypto";
 import ByteBuffer from "bytebuffer";
 
@@ -37,11 +37,12 @@ export class Processor implements Contracts.TransactionPool.Processor {
         const excess: string[] = [];
         let errors: { [id: string]: Contracts.TransactionPool.ProcessorError } | undefined = undefined;
 
-        const broadcastableTransactions: Interfaces.ITransaction[] = [];
+        const broadcastTransactions: Interfaces.ITransaction[] = [];
 
         try {
             for (let i = 0; i < data.length; i++) {
                 const transactionData = data[i];
+                const entryId = transactionData instanceof Buffer ? String(i) : transactionData.id ?? String(i);
 
                 try {
                     const transaction =
@@ -49,22 +50,23 @@ export class Processor implements Contracts.TransactionPool.Processor {
                             ? await this.getTransactionFromBuffer(transactionData)
                             : await this.getTransactionFromData(transactionData);
                     await this.pool.addTransaction(transaction);
-                    accept.push(transactionData instanceof Buffer ? `${i}` : transactionData.id ?? `${i}`);
+                    accept.push(entryId);
 
                     try {
                         await this.dynamicFeeMatcher.throwIfCannotBroadcast(transaction);
-                        broadcastableTransactions.push(transaction);
+                        broadcastTransactions.push(transaction);
+                        broadcast.push(entryId);
                     } catch {}
                 } catch (error) {
-                    invalid.push(transactionData instanceof Buffer ? `${i}` : transactionData.id ?? `${i}`);
+                    invalid.push(entryId);
 
                     if (error instanceof Contracts.TransactionPool.PoolError) {
                         if (error.type === "ERR_EXCEEDS_MAX_COUNT") {
-                            excess.push(transactionData instanceof Buffer ? `${i}` : transactionData.id ?? `${i}`);
+                            excess.push(entryId);
                         }
 
                         if (!errors) errors = {};
-                        errors[transactionData instanceof Buffer ? i : transactionData.id ?? i] = {
+                        errors[entryId] = {
                             type: error.type,
                             message: error.message,
                         };
@@ -74,14 +76,10 @@ export class Processor implements Contracts.TransactionPool.Processor {
                 }
             }
         } finally {
-            if (this.transactionBroadcaster && broadcastableTransactions.length !== 0) {
+            if (this.transactionBroadcaster && broadcastTransactions.length !== 0) {
                 this.transactionBroadcaster
-                    .broadcastTransactions(broadcastableTransactions)
+                    .broadcastTransactions(broadcastTransactions)
                     .catch((error) => this.logger.error(error.stack));
-                for (const transaction of broadcastableTransactions) {
-                    AppUtils.assert.defined<string>(transaction.id);
-                    broadcast.push(transaction.id);
-                }
             }
         }