Skip to content

refactor: use maps.Copy to simplify the code #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
oncecelll wants to merge 3 commits into from
Closed

refactor: use maps.Copy to simplify the code #925

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
441852f
refactor: use maps.Copy to simplify the code
oncecelll Jan 9, 2026
1be7999
Merge branch 'main' into main
aljo242 Jan 19, 2026
15c8e9b
Merge branch 'main' into main
aljo242 Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions mempool/txpool/txpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package txpool
import (
"errors"
"fmt"
"maps"
"math/big"
"sync"

Expand Down Expand Up @@ -381,9 +382,7 @@ func (p *TxPool) Add(txs []*types.Transaction, sync bool) []error {
func (p *TxPool) Pending(filter PendingFilter) map[common.Address][]*LazyTransaction {
txs := make(map[common.Address][]*LazyTransaction)
for _, subpool := range p.Subpools {
for addr, set := range subpool.Pending(filter) {
txs[addr] = set
}
maps.Copy(txs, subpool.Pending(filter))
Copy link
Contributor

@mattac21 mattac21 Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you mind adding tests for these? should be pretty straightforward, looks like we already have a mocked subpool you can use here. thanks!

}
return txs
}
Expand Down Expand Up @@ -445,12 +444,8 @@ func (p *TxPool) Content() (map[common.Address][]*types.Transaction, map[common.
for _, subpool := range p.Subpools {
run, block := subpool.Content()

for addr, txs := range run {
runnable[addr] = txs
}
for addr, txs := range block {
blocked[addr] = txs
}
maps.Copy(runnable, run)
maps.Copy(blocked, block)
}
return runnable, blocked
}
Expand Down
Loading