From 7697641390c417aa46eb4c93720ad404faeea347 Mon Sep 17 00:00:00 2001 From: Joel Burget Date: Mon, 16 Oct 2017 12:18:47 -0400 Subject: [PATCH] Clearer naming in minter / work.commitTransactions. --- raft/minter.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/raft/minter.go b/raft/minter.go index a44715adc..b33a4a2d6 100644 --- a/raft/minter.go +++ b/raft/minter.go @@ -350,7 +350,7 @@ func (minter *minter) mintNewBlock() { } func (env *work) commitTransactions(txes *types.TransactionsByPriceAndNonce, bc *core.BlockChain) (types.Transactions, types.Receipts, types.Receipts, []*types.Log) { - var logs []*types.Log + var allLogs []*types.Log var committedTxes types.Transactions var publicReceipts types.Receipts var privateReceipts types.Receipts @@ -375,19 +375,19 @@ func (env *work) commitTransactions(txes *types.TransactionsByPriceAndNonce, bc txCount++ committedTxes = append(committedTxes, tx) - logs = append(logs, publicReceipt.Logs...) publicReceipts = append(publicReceipts, publicReceipt) + allLogs = append(allLogs, publicReceipt.Logs...) if privateReceipt != nil { - logs = append(logs, privateReceipt.Logs...) privateReceipts = append(privateReceipts, privateReceipt) + allLogs = append(allLogs, privateReceipt.Logs...) } txes.Shift() } } - return committedTxes, publicReceipts, privateReceipts, logs + return committedTxes, publicReceipts, privateReceipts, allLogs } func (env *work) commitTransaction(tx *types.Transaction, bc *core.BlockChain, gp *core.GasPool) (*types.Receipt, *types.Receipt, error) {