From 2306ceafb23239ff860ae59c887dad4383b6196d Mon Sep 17 00:00:00 2001
From: Daniel Liu <liudaniel@qq.com>
Date: Tue, 29 Oct 2024 09:14:23 +0800
Subject: [PATCH] fix impossible condition: nil != nil

---
 accounts/abi/bind/base.go    | 7 ++-----
 core/order_pool_test.go      | 4 ----
 whisper/whisperv6/whisper.go | 3 ---
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
index 4d5390d15b..0477d8c59e 100644
--- a/accounts/abi/bind/base.go
+++ b/accounts/abi/bind/base.go
@@ -280,7 +280,7 @@ func (c *BoundContract) FilterLogs(opts *FilterOpts, name string, query ...[]int
 	if err != nil {
 		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 {
 			select {
 			case logs <- log:
@@ -289,11 +289,8 @@ func (c *BoundContract) FilterLogs(opts *FilterOpts, name string, query ...[]int
 			}
 		}
 		return nil
-	}), nil
+	})
 
-	if err != nil {
-		return nil, nil, err
-	}
 	return logs, sub, nil
 }
 
diff --git a/core/order_pool_test.go b/core/order_pool_test.go
index 6029e92820..c12c167d1c 100644
--- a/core/order_pool_test.go
+++ b/core/order_pool_test.go
@@ -60,10 +60,6 @@ func getNonce(t *testing.T, userAddress common.Address) (uint64, error) {
 		return 0, err
 	}
 	var result interface{}
-	if err != nil {
-
-		return 0, err
-	}
 	err = rpcClient.Call(&result, "XDCx_getOrderCount", userAddress)
 	if err != nil {
 		return 0, err
diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go
index f72e5ede37..28fed9f676 100644
--- a/whisper/whisperv6/whisper.go
+++ b/whisper/whisperv6/whisper.go
@@ -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,
 	// because it's an once in a session experience
 	derived := pbkdf2.Key([]byte(password), nil, 65356, aesKeyLength, sha256.New)
-	if err != nil {
-		return "", err
-	}
 
 	whisper.keyMu.Lock()
 	defer whisper.keyMu.Unlock()