forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove commented function and modify error comparison

Browse source
This commit is contained in:
iseki 2024-03-02 16:09:57 +08:00
parent 0a2f33946b
commit 21158b0da2
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
event/feed.go
View file

@ -220,19 +220,3 @@ func (cs caseList) deactivate(index int) caseList {
cs[index], cs[last] = cs[last], cs[index] cs[index], cs[last] = cs[last], cs[index]
return cs[:last] return cs[:last]
} }
// func (cs caseList) String() string {
// s := "["
// for i, cas := range cs {
// if i != 0 {
// s += ", "
// }
// switch cas.Dir {
// case reflect.SelectSend:
// s += fmt.Sprintf("%v<-", cas.Chan.Interface())
// case reflect.SelectRecv:
// s += fmt.Sprintf("<-%v", cas.Chan.Interface())
// }
// }
// return s + "]"
// }

12
trie/iterator.go
View file

@ -268,10 +268,11 @@ func (it *nodeIterator) NodeBlob() []byte {
} }
func (it *nodeIterator) Error() error { func (it *nodeIterator) Error() error {
if it.err == errIteratorEnd { if errors.Is(it.err, errIteratorEnd) {
return nil return nil
} }
if seek, ok := it.err.(seekError); ok { var seek seekError
if errors.As(it.err, &seek) {
return seek.err return seek.err
} }
return it.err return it.err
@ -282,10 +283,11 @@ func (it *nodeIterator) Error() error {
// sets the Error field to the encountered failure. If `descend` is false, // sets the Error field to the encountered failure. If `descend` is false,
// skips iterating over any subnodes of the current node. // skips iterating over any subnodes of the current node.
func (it *nodeIterator) Next(descend bool) bool { func (it *nodeIterator) Next(descend bool) bool {
if it.err == errIteratorEnd { if errors.Is(it.err, errIteratorEnd) {
return false return false
} }
if seek, ok := it.err.(seekError); ok { var seek seekError
if errors.As(it.err, &seek) {
if it.err = it.seek(seek.key); it.err != nil { if it.err = it.seek(seek.key); it.err != nil {
return false return false
} }
@ -307,7 +309,7 @@ func (it *nodeIterator) seek(prefix []byte) error {
// Move forward until we're just before the closest match to key. // Move forward until we're just before the closest match to key.
for { for {
state, parentIndex, path, err := it.peekSeek(key) state, parentIndex, path, err := it.peekSeek(key)
if err == errIteratorEnd { if errors.Is(err, errIteratorEnd) {
return errIteratorEnd return errIteratorEnd
} else if err != nil { } else if err != nil {
return seekError{prefix, err} return seekError{prefix, err}