fix Test_GetLogsForQuery (#1836)

* fix Test_GetLogsForQuery

* chore: fix lint errors

* chore: accommodate review changes

- Review changes suggested in PR #1787

jsonrpc/filter_manager_test.go

@@ -142,16 +142,14 @@ func Test_GetLogsForQuery(t *testing.T) {
 
 			foundLogs, logError := f.GetLogsForQuery(testCase.query)
 
-			if logError != nil && testCase.expectedError == nil {
-				// If there is an error and test isn't expected to fail
-				t.Fatalf("Error: %v", logError)
-			}
-
 			if testCase.expectedError != nil {
-				assert.Lenf(t, foundLogs, testCase.expectedLength, "Invalid number of logs found")
+				assert.ErrorIs(t, logError, testCase.expectedError)
+
+				return
 			}
 
-			assert.ErrorIs(t, logError, testCase.expectedError)
+			assert.NoError(t, logError)
+			assert.Lenf(t, foundLogs, testCase.expectedLength, "Invalid number of logs found")
 		})
 	}
 }
@@ -593,7 +591,7 @@ func TestFilterWebsocket(t *testing.T) {
 	select {
 	case <-msgCh:
 	case <-time.After(2 * time.Second):
-		t.Fatal("bad")
+		t.Fatal("no new block events received in the predefined time slot")
 	}
 }
 
@@ -621,7 +619,7 @@ func TestFilterPendingTxWebsocket(t *testing.T) {
 	select {
 	case <-msgCh:
 	case <-time.After(2 * time.Second):
-		t.Fatal("bad")
+		t.Fatal("no tx pool events received in the predefined time slot")
 	}
 }