cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
pull from: v1.11.6-statediff-v5
merge into: cerc-io:master
Conversation 0 Commits 1565 Files Changed 1471 +3
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 06632da2bb - Show all commits

1
core/txpool/list.go
View File

@ -45,6 +45,7 @@ func (h *nonceHeap) Pop() interface{} {
old := *h old := *h
n := len(old) n := len(old)
x := old[n-1] x := old[n-1]
old[n-1] = 0
*h = old[0 : n-1] *h = old[0 : n-1]
return x return x
} }

1
core/types/transaction.go
View File

@ -508,6 +508,7 @@ func (s *TxByPriceAndTime) Pop() interface{} {
old := *s old := *s
n := len(old) n := len(old)
x := old[n-1] x := old[n-1]
old[n-1] = nil
*s = old[0 : n-1] *s = old[0 : n-1]
return x return x
} }

1
p2p/util.go
View File

@ -70,6 +70,7 @@ func (h *expHeap) Pop() interface{} {
old := *h old := *h
n := len(old) n := len(old)
x := old[n-1] x := old[n-1]
old[n-1] = expItem{}
*h = old[0 : n-1] *h = old[0 : n-1]
return x return x
} }