forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 13:16:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix comments

Browse source
This commit is contained in:
maskpp 2025-10-20 11:30:31 +08:00
parent b02df2da72
commit 2f40c06aef
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eth/filters/filter.go
View file

@ -563,7 +563,7 @@ type ReceiptWithTx struct {
// In addition to returning receipts, it also returns the corresponding transactions. // In addition to returning receipts, it also returns the corresponding transactions.
// This is because receipts only contain low-level data, while user-facing data // This is because receipts only contain low-level data, while user-facing data
// may require additional information from the Transaction. // may require additional information from the Transaction.
func filterReceipts(txHashMap map[common.Hash]bool, ev core.ChainEvent) []*ReceiptWithTx { func filterReceipts(txHashes map[common.Hash]bool, ev core.ChainEvent) []*ReceiptWithTx {
var ret []*ReceiptWithTx var ret []*ReceiptWithTx
receipts := ev.Receipts receipts := ev.Receipts
@ -574,7 +574,7 @@ func filterReceipts(txHashMap map[common.Hash]bool, ev core.ChainEvent) []*Recei
return ret return ret
} }
if len(txHashMap) == 0 { if len(txHashes) == 0 {
// No filter, send all receipts with their transactions. // No filter, send all receipts with their transactions.
ret = make([]*ReceiptWithTx, len(receipts)) ret = make([]*ReceiptWithTx, len(receipts))
for i, receipt := range receipts { for i, receipt := range receipts {
@ -585,14 +585,14 @@ func filterReceipts(txHashMap map[common.Hash]bool, ev core.ChainEvent) []*Recei
} }
} else { } else {
for i, receipt := range receipts { for i, receipt := range receipts {
if txHashMap[receipt.TxHash] { if txHashes[receipt.TxHash] {
ret = append(ret, &ReceiptWithTx{ ret = append(ret, &ReceiptWithTx{
Receipt: receipt, Receipt: receipt,
Transaction: txs[i], Transaction: txs[i],
}) })
// Early exit if all receipts are found // Early exit if all receipts are found
if len(ret) == len(txHashMap) { if len(ret) == len(txHashes) {
break break
} }
} }

6
eth/filters/filter_system.go
View file

@ -185,7 +185,7 @@ type subscription struct {
txs chan []*types.Transaction txs chan []*types.Transaction
headers chan *types.Header headers chan *types.Header
receipts chan []*ReceiptWithTx receipts chan []*ReceiptWithTx
hashSet map[common.Hash]bool // contains transaction hashes for transactionReceipts subscription filtering txHashes map[common.Hash]bool // contains transaction hashes for transactionReceipts subscription filtering
installed chan struct{} // closed when the filter is installed installed chan struct{} // closed when the filter is installed
err chan error // closed when the filter is uninstalled err chan error // closed when the filter is uninstalled
} }
@ -415,7 +415,7 @@ func (es *EventSystem) SubscribeTransactionReceipts(txHashes []common.Hash, rece
txs: make(chan []*types.Transaction), txs: make(chan []*types.Transaction),
headers: make(chan *types.Header), headers: make(chan *types.Header),
receipts: receipts, receipts: receipts,
hashSet: hashSet, txHashes: hashSet,
installed: make(chan struct{}), installed: make(chan struct{}),
err: make(chan error), err: make(chan error),
} }
@ -449,7 +449,7 @@ func (es *EventSystem) handleChainEvent(filters filterIndex, ev core.ChainEvent)
// Handle transaction receipts subscriptions when a new block is added // Handle transaction receipts subscriptions when a new block is added
for _, f := range filters[TransactionReceiptsSubscription] { for _, f := range filters[TransactionReceiptsSubscription] {
matchedReceipts := filterReceipts(f.hashSet, ev) matchedReceipts := filterReceipts(f.txHashes, ev)
if len(matchedReceipts) > 0 { if len(matchedReceipts) > 0 {
f.receipts <- matchedReceipts f.receipts <- matchedReceipts
} }