chore_: test fixes

Author: dlipicar

rpc/client.go

@@ -159,7 +159,9 @@ func NewClient(config ClientConfig) (*Client, error) {
 }
 
 func (c *Client) Start(ctx context.Context) {
-	c.signalsTransmitter.Start()
+	if err := c.signalsTransmitter.Start(); err != nil {
+		c.logger.Error("Failed to start signals transmitter", zap.Error(err))
+	}
 	c.networkManager.Start()
 
 	if c.stopMonitoringFunc != nil {

services/wallet/keycard_pairings_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/status-im/status-go/params"
 	"github.com/status-im/status-go/pkg/pubsub"
 	"github.com/status-im/status-go/rpc"
-	"github.com/status-im/status-go/rpc/network"
 	"github.com/status-im/status-go/t/helpers"
 	"github.com/status-im/status-go/walletdatabase"
 )
@@ -28,7 +27,12 @@ func TestKeycardPairingsFile(t *testing.T) {
 
 	accountsPublisher := pubsub.NewPublisher()
 
-	service := NewService(db, accountsDb, appDB, &rpc.Client{NetworkManager: network.NewManager(db, nil)}, accountsPublisher, nil, nil, &params.NodeConfig{}, nil, nil, nil, nil, "")
+	rpcClient, err := rpc.NewClient(rpc.ClientConfig{
+		DB:                db,
+		AccountsPublisher: accountsPublisher,
+	})
+	require.NoError(t, err)
+	service := NewService(db, accountsDb, appDB, rpcClient, accountsPublisher, nil, nil, &params.NodeConfig{}, nil, nil, nil, nil, "")
 
 	data, err := service.KeycardPairings().GetPairingsJSONFileContent()
 	require.NoError(t, err)

services/wallet/reader_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/event"
+	"github.com/status-im/status-go/healthmanager/rpcstatus"
 	"github.com/status-im/status-go/rpc/chain"
 	mock_client "github.com/status-im/status-go/rpc/chain/mock/client"
 	"github.com/status-im/status-go/services/wallet/testutils"
@@ -885,8 +886,8 @@ func TestGetCachedBalances(t *testing.T) {
 	expectedChains := []uint64{1, 2}
 	tokenManager.EXPECT().GetTokensByChainIDs(testutils.NewUint64SliceMatcher(expectedChains)).Return(allTokens, nil)
 	tokenManager.EXPECT().GetTokenHistoricalBalance(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, nil)
-	mockClientIface1.EXPECT().IsConnected().Return(true)
-	mockClientIface2.EXPECT().IsConnected().Return(true)
+	mockClientIface1.EXPECT().GetConnectionStatus().Return(rpcstatus.StatusUp)
+	mockClientIface2.EXPECT().GetConnectionStatus().Return(rpcstatus.StatusUp)
 	tokens, err := reader.GetCachedBalances(clients, addresses)
 	require.NoError(t, err)
 
@@ -1012,8 +1013,8 @@ func TestFetchBalances(t *testing.T) {
 
 	tokenAddresses := getTokenAddresses(allTokens)
 	tokenManager.EXPECT().GetBalancesByChain(context.TODO(), clients, addresses, testutils.NewAddressSliceMatcher(tokenAddresses)).Return(expectedBalances, nil)
-	mockClientIface1.EXPECT().IsConnected().Return(true)
-	mockClientIface2.EXPECT().IsConnected().Return(true)
+	mockClientIface1.EXPECT().GetConnectionStatus().Return(rpcstatus.StatusUp)
+	mockClientIface2.EXPECT().GetConnectionStatus().Return(rpcstatus.StatusUp)
 	tokens, err := reader.FetchBalances(context.TODO(), clients, addresses)
 	require.NoError(t, err)
 

services/wallet/transfer/commands_sequential_test.go

@@ -12,6 +12,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/status-im/status-go/contracts"
+	"github.com/status-im/status-go/healthmanager/rpcstatus"
+	"github.com/status-im/status-go/services/wallet/blockchainstate"
+	"github.com/status-im/status-go/services/wallet/token/token-lists/fetcher"
+	"github.com/status-im/status-go/t/utils"
+
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -703,12 +709,12 @@ func (tc *TestClient) SetIsConnected(value bool) {
 	}
 }
 
-func (tc *TestClient) IsConnected() bool {
+func (tc *TestClient) GetConnectionStatus() rpcstatus.StatusType {
 	if tc.traceAPICalls {
-		tc.t.Log("GetIsConnected")
+		tc.t.Log("GetConnectionStatus")
 	}
 
-	return true
+	return rpcstatus.StatusUp
 }
 
 func (tc *TestClient) GetLimiter() rpclimiter.RequestLimiter {