fix(efp): use single EFP provider, initialization test changes, etc

Refactored the following.Manager to accept a single EFP provider and logger instead of a slice of providers. Updated initialization in service.go and all related tests. Adjusted EFP client to require an HTTP client on construction, improving dependency injection and testability.

Author: caveman-eth

services/wallet/following/manager.go

@@ -2,57 +2,55 @@ package following
 
 import (
 	"context"
+	"errors"
 	"time"
 
 	"go.uber.org/zap"
 
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/status-im/status-go/logutils"
 	"github.com/status-im/status-go/services/wallet/thirdparty/efp"
 )
 
-// Manager handles following address operations using EFP providers
+// Manager handles following address operations using EFP provider
 type Manager struct {
-	providers []efp.FollowingDataProvider
+	provider efp.FollowingDataProvider
+	logger   *zap.Logger
 }
 
-// NewManager creates a new following manager with the provided EFP providers
-func NewManager(providers []efp.FollowingDataProvider) *Manager {
+// NewManager creates a new following manager with the provided EFP provider
+func NewManager(provider efp.FollowingDataProvider, logger *zap.Logger) *Manager {
 	return &Manager{
-		providers: providers,
+		provider: provider,
+		logger:   logger,
 	}
 }
 
 // FetchFollowingAddresses fetches the list of addresses that the given user is following
-// Uses the first available provider (can be enhanced later with fallback logic)
 func (m *Manager) FetchFollowingAddresses(ctx context.Context, userAddress common.Address, search string, limit, offset int) ([]efp.FollowingAddress, error) {
-	logutils.ZapLogger().Debug("following.Manager.FetchFollowingAddresses",
+	m.logger.Debug("following.Manager.FetchFollowingAddresses",
 		zap.String("userAddress", userAddress.Hex()),
 		zap.String("search", search),
 		zap.Int("limit", limit),
 		zap.Int("offset", offset),
-		zap.Int("providers.len", len(m.providers)),
 	)
 
-	if len(m.providers) == 0 {
-		return []efp.FollowingAddress{}, nil
+	if m.provider == nil {
+		return nil, errors.New("EFP provider not initialized")
 	}
 
-	// Use the first provider (EFP client)
-	provider := m.providers[0]
-	if !provider.IsConnected() {
-		logutils.ZapLogger().Warn("EFP provider not connected", zap.String("providerID", provider.ID()))
+	if !m.provider.IsConnected() {
+		m.logger.Warn("EFP provider not connected", zap.String("providerID", m.provider.ID()))
 		return []efp.FollowingAddress{}, nil
 	}
 
 	startTime := time.Now()
-	addresses, err := provider.FetchFollowingAddresses(ctx, userAddress, search, limit, offset)
+	addresses, err := m.provider.FetchFollowingAddresses(ctx, userAddress, search, limit, offset)
 	duration := time.Since(startTime)
 
-	logutils.ZapLogger().Debug("following.Manager.FetchFollowingAddresses completed",
+	m.logger.Debug("following.Manager.FetchFollowingAddresses completed",
 		zap.String("userAddress", userAddress.Hex()),
-		zap.String("providerID", provider.ID()),
+		zap.String("providerID", m.provider.ID()),
 		zap.Int("addresses.len", len(addresses)),
 		zap.Duration("duration", duration),
 		zap.Error(err),
@@ -67,27 +65,26 @@ func (m *Manager) FetchFollowingAddresses(ctx context.Context, userAddress commo
 
 // FetchFollowingStats fetches the stats (following count) for a user
 func (m *Manager) FetchFollowingStats(ctx context.Context, userAddress common.Address) (int, error) {
-	logutils.ZapLogger().Debug("following.Manager.FetchFollowingStats",
+	m.logger.Debug("following.Manager.FetchFollowingStats",
 		zap.String("userAddress", userAddress.Hex()),
 	)
 
-	if len(m.providers) == 0 {
-		return 0, nil
+	if m.provider == nil {
+		return 0, errors.New("EFP provider not initialized")
 	}
 
-	provider := m.providers[0]
-	if !provider.IsConnected() {
-		logutils.ZapLogger().Warn("EFP provider not connected", zap.String("providerID", provider.ID()))
+	if !m.provider.IsConnected() {
+		m.logger.Warn("EFP provider not connected", zap.String("providerID", m.provider.ID()))
 		return 0, nil
 	}
 
-	count, err := provider.FetchFollowingStats(ctx, userAddress)
+	count, err := m.provider.FetchFollowingStats(ctx, userAddress)
 	if err != nil {
-		logutils.ZapLogger().Error("following.Manager.FetchFollowingStats error", zap.Error(err))
+		m.logger.Error("following.Manager.FetchFollowingStats error", zap.Error(err))
 		return 0, err
 	}
 
-	logutils.ZapLogger().Debug("following.Manager.FetchFollowingStats completed",
+	m.logger.Debug("following.Manager.FetchFollowingStats completed",
 		zap.String("userAddress", userAddress.Hex()),
 		zap.Int("count", count),
 	)

services/wallet/following/manager_test.go

@@ -1,13 +1,13 @@
 package following
 
 import (
-	"context"
 	"errors"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
+	"go.uber.org/zap"
 
 	"github.com/status-im/status-go/services/wallet/thirdparty/efp"
 	mock_efp "github.com/status-im/status-go/services/wallet/thirdparty/efp/mock"
@@ -17,7 +17,7 @@ func TestFetchFollowingAddressesSuccess(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	ctx := context.TODO()
+	ctx := t.Context()
 	userAddress := common.HexToAddress("0x742d35cc6cf4c7c7")
 
 	expected := []efp.FollowingAddress{
@@ -32,7 +32,7 @@ func TestFetchFollowingAddressesSuccess(t *testing.T) {
 	mockProvider.EXPECT().IsConnected().Return(true)
 	mockProvider.EXPECT().FetchFollowingAddresses(ctx, userAddress, "", 10, 0).Return(expected, nil)
 
-	manager := NewManager([]efp.FollowingDataProvider{mockProvider})
+	manager := NewManager(mockProvider, zap.NewNop())
 
 	result, err := manager.FetchFollowingAddresses(ctx, userAddress, "", 10, 0)
 
@@ -46,15 +46,15 @@ func TestFetchFollowingStatsSuccess(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	ctx := context.TODO()
+	ctx := t.Context()
 	userAddress := common.HexToAddress("0x742d35cc6cf4c7c7")
 	expectedCount := 150
 
 	mockProvider := mock_efp.NewMockFollowingDataProvider(mockCtrl)
 	mockProvider.EXPECT().IsConnected().Return(true)
 	mockProvider.EXPECT().FetchFollowingStats(ctx, userAddress).Return(expectedCount, nil)
 
-	manager := NewManager([]efp.FollowingDataProvider{mockProvider})
+	manager := NewManager(mockProvider, zap.NewNop())
 
 	result, err := manager.FetchFollowingStats(ctx, userAddress)
 
@@ -66,14 +66,14 @@ func TestFetchFollowingAddressesProviderNotConnected(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	ctx := context.TODO()
+	ctx := t.Context()
 	userAddress := common.HexToAddress("0x742d35cc6cf4c7c7")
 
 	mockProvider := mock_efp.NewMockFollowingDataProvider(mockCtrl)
 	mockProvider.EXPECT().IsConnected().Return(false)
 	mockProvider.EXPECT().ID().Return("efp").AnyTimes()
 
-	manager := NewManager([]efp.FollowingDataProvider{mockProvider})
+	manager := NewManager(mockProvider, zap.NewNop())
 
 	result, err := manager.FetchFollowingAddresses(ctx, userAddress, "", 10, 0)
 
@@ -85,7 +85,7 @@ func TestFetchFollowingAddressesProviderError(t *testing.T) {
 	mockCtrl := gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	ctx := context.TODO()
+	ctx := t.Context()
 	userAddress := common.HexToAddress("0x742d35cc6cf4c7c7")
 	expectedError := errors.New("provider error")
 
@@ -94,7 +94,7 @@ func TestFetchFollowingAddressesProviderError(t *testing.T) {
 	mockProvider.EXPECT().IsConnected().Return(true)
 	mockProvider.EXPECT().FetchFollowingAddresses(ctx, userAddress, "", 10, 0).Return(nil, expectedError)
 
-	manager := NewManager([]efp.FollowingDataProvider{mockProvider})
+	manager := NewManager(mockProvider, zap.NewNop())
 
 	result, err := manager.FetchFollowingAddresses(ctx, userAddress, "", 10, 0)
 
@@ -103,14 +103,15 @@ func TestFetchFollowingAddressesProviderError(t *testing.T) {
 	require.Equal(t, expectedError, err)
 }
 
-func TestFetchFollowingAddressesNoProviders(t *testing.T) {
-	ctx := context.TODO()
+func TestFetchFollowingAddressesNoProvider(t *testing.T) {
+	ctx := t.Context()
 	userAddress := common.HexToAddress("0x742d35cc6cf4c7c7")
 
-	manager := NewManager([]efp.FollowingDataProvider{})
+	manager := NewManager(nil, zap.NewNop())
 
 	result, err := manager.FetchFollowingAddresses(ctx, userAddress, "", 10, 0)
 
-	require.NoError(t, err)
-	require.Len(t, result, 0)
+	require.Error(t, err)
+	require.Nil(t, result)
+	require.Contains(t, err.Error(), "EFP provider not initialized")
 }

services/wallet/service.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"time"
 
 	"github.com/golang/protobuf/proto"
 
@@ -117,6 +118,7 @@ func NewService(
 	var collectibleProviders thirdparty.CollectibleProviders = thirdparty.CollectibleProviders{}
 	var pathProcessors []pathprocessor.PathProcessor = []pathprocessor.PathProcessor{}
 	var leaderboardConfig leaderboard.ServiceConfig = leaderboard.NewDefaultServiceConfig()
+	var followingManager *following.Manager
 
 	if thirdpartyServicesEnabled {
 
@@ -176,6 +178,24 @@ func NewService(
 		pathProcessors = buildPathProcessors(rpcClient, transactor, tokenManager, ensResolver, featureFlags)
 
 		leaderboardConfig = leaderboard.NewLeaderboardConfig(config.WalletConfig.MarketDataProxyConfig)
+
+		// EFP (Ethereum Follow Protocol) provider
+		efpHTTPClient := thirdparty.NewHTTPClient(
+			thirdparty.WithDetailedTimeouts(
+				5*time.Second,  // dialTimeout
+				5*time.Second,  // tlsHandshakeTimeout
+				5*time.Second,  // responseHeaderTimeout
+				20*time.Second, // requestTimeout
+			),
+			thirdparty.WithMaxRetries(5),
+		)
+		efpClient := efp.NewClient(efpHTTPClient)
+		followingManager = following.NewManager(efpClient, logutils.ZapLogger().Named("FollowingManager"))
+	}
+
+	// Initialize followingManager with nil provider if third-party services are disabled
+	if followingManager == nil {
+		followingManager = following.NewManager(nil, logutils.ZapLogger().Named("FollowingManager"))
 	}
 
 	cryptoOnRampManager := onramp.NewManager(cryptoOnRampProviders)
@@ -248,13 +268,6 @@ func NewService(
 		collectiblesOwnershipController,
 		collectiblesPublisher)
 
-	// EFP (Ethereum Follow Protocol) providers
-	efpClient := efp.NewClient()
-	followingProviders := []efp.FollowingDataProvider{
-		efpClient,
-	}
-	followingManager := following.NewManager(followingProviders)
-
 	activity := activity.NewService(db, accountsDB, tokenManager, collectiblesManager, feed)
 
 	router := router.NewRouter(rpcClient, transactor, tokenManager, tokenBalancesFetcher, marketManager, collectibles,

services/wallet/thirdparty/efp/client.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
-	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 
@@ -14,10 +13,6 @@ import (
 
 const baseURL = "https://api.ethfollow.xyz/api/v1"
 
-const (
-	requestDelay = 100 * time.Millisecond
-)
-
 // ENSData represents ENS information from the EFP API
 type ENSData struct {
 	Name      string            `json:"name"`
@@ -61,17 +56,7 @@ type Client struct {
 	baseURL    string
 }
 
-func NewClient() *Client {
-	httpClient := thirdparty.NewHTTPClient(
-		thirdparty.WithDetailedTimeouts(
-			5*time.Second,  // dialTimeout
-			5*time.Second,  // tlsHandshakeTimeout
-			5*time.Second,  // responseHeaderTimeout
-			20*time.Second, // requestTimeout
-		),
-		thirdparty.WithMaxRetries(5),
-	)
-
+func NewClient(httpClient *thirdparty.HTTPClient) *Client {
 	return &Client{
 		httpClient: httpClient,
 		baseURL:    baseURL,