poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clearer naming in minter / work.commitTransactions.

This commit is contained in:
Joel Burget 2017-10-16 12:18:47 -04:00
parent 1f0d953c07
commit 7697641390
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
raft/minter.go
View File

@ -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) {