forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 02:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix impossible condition: nil != nil

Browse source
This commit is contained in:
Daniel Liu 2024-10-29 09:14:23 +08:00
parent 6ed8d399c2
commit 2306ceafb2
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
accounts/abi/bind/base.go
View file

@ -280,7 +280,7 @@ func (c *BoundContract) FilterLogs(opts *FilterOpts, name string, query ...[]int
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
sub, err := event.NewSubscription(func(quit <-chan struct{}) error { sub := event.NewSubscription(func(quit <-chan struct{}) error {
for _, log := range buff { for _, log := range buff {
select { select {
case logs <- log: case logs <- log:
@ -289,11 +289,8 @@ func (c *BoundContract) FilterLogs(opts *FilterOpts, name string, query ...[]int
} }
} }
return nil return nil
}), nil })
if err != nil {
return nil, nil, err
}
return logs, sub, nil return logs, sub, nil
} }

4
core/order_pool_test.go
View file

@ -60,10 +60,6 @@ func getNonce(t *testing.T, userAddress common.Address) (uint64, error) {
return 0, err return 0, err
} }
var result interface{} var result interface{}
if err != nil {
return 0, err
}
err = rpcClient.Call(&result, "XDCx_getOrderCount", userAddress) err = rpcClient.Call(&result, "XDCx_getOrderCount", userAddress)
if err != nil { if err != nil {
return 0, err return 0, err

3
whisper/whisperv6/whisper.go
View file

@ -501,9 +501,6 @@ func (whisper *Whisper) AddSymKeyFromPassword(password string) (string, error) {
// kdf should run no less than 0.1 seconds on an average computer, // kdf should run no less than 0.1 seconds on an average computer,
// because it's an once in a session experience // because it's an once in a session experience
derived := pbkdf2.Key([]byte(password), nil, 65356, aesKeyLength, sha256.New) derived := pbkdf2.Key([]byte(password), nil, 65356, aesKeyLength, sha256.New)
if err != nil {
return "", err
}
whisper.keyMu.Lock() whisper.keyMu.Lock()
defer whisper.keyMu.Unlock() defer whisper.keyMu.Unlock()