From adcd51b88bf5db2d61c7964737476175f8c3e3d2 Mon Sep 17 00:00:00 2001
From: Patryk Osmaczko <osmaczkopatryk@gmail.com>
Date: Tue, 22 Oct 2024 17:38:05 +0200
Subject: [PATCH] chore_: fix lint

---
 account/accounts_test.go                | 14 +++++++++++---
 metrics/node/metrics.go                 |  4 +++-
 services/wallet/collectibles/service.go |  2 +-
 services/web3provider/api_test.go       |  5 ++++-
 wakuv2/api.go                           |  3 ++-
 wakuv2/common/message.go                |  3 ++-
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/account/accounts_test.go b/account/accounts_test.go
index 139205618de..a1aff46efe4 100644
--- a/account/accounts_test.go
+++ b/account/accounts_test.go
@@ -8,6 +8,8 @@ import (
 	"path/filepath"
 	"testing"
 
+	"go.uber.org/zap"
+
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/keystore"
 	"github.com/status-im/status-go/eth-node/types"
@@ -21,7 +23,9 @@ const testPassword = "test-password"
 const newTestPassword = "new-test-password"
 
 func TestVerifyAccountPassword(t *testing.T) {
-	accManager := NewGethManager()
+	logger, err := zap.NewDevelopment()
+	require.NoError(t, err)
+	accManager := NewGethManager(logger)
 	keyStoreDir := t.TempDir()
 	emptyKeyStoreDir := t.TempDir()
 
@@ -103,7 +107,9 @@ func TestVerifyAccountPasswordWithAccountBeforeEIP55(t *testing.T) {
 	err := utils.ImportTestAccount(keyStoreDir, "test-account3-before-eip55.pk")
 	require.NoError(t, err)
 
-	accManager := NewGethManager()
+	logger, err := zap.NewDevelopment()
+	require.NoError(t, err)
+	accManager := NewGethManager(logger)
 
 	address := types.HexToAddress(utils.TestConfig.Account3.WalletAddress)
 	_, err = accManager.VerifyAccountPassword(keyStoreDir, address.Hex(), utils.TestConfig.Account3.Password)
@@ -133,7 +139,9 @@ type testAccount struct {
 // SetupTest is used here for reinitializing the mock before every
 // test function to avoid faulty execution.
 func (s *ManagerTestSuite) SetupTest() {
-	s.accManager = NewGethManager()
+	logger, err := zap.NewDevelopment()
+	s.Require().NoError(err)
+	s.accManager = NewGethManager(logger)
 
 	keyStoreDir := s.T().TempDir()
 	s.Require().NoError(s.accManager.InitKeystore(keyStoreDir))
diff --git a/metrics/node/metrics.go b/metrics/node/metrics.go
index e9fff5fc268..04e65142320 100644
--- a/metrics/node/metrics.go
+++ b/metrics/node/metrics.go
@@ -4,6 +4,8 @@ import (
 	"errors"
 	"strings"
 
+	"go.uber.org/zap"
+
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/p2p"
 
@@ -71,7 +73,7 @@ func calculatePeerCounts(server *p2p.Server) {
 	for _, p := range peers {
 		labels, err := labelsFromNodeName(p.Fullname())
 		if err != nil {
-			logger.Warn("failed parsing peer name", "error", err, "name", p.Name())
+			logger.Warn("failed parsing peer name", zap.String("name", p.Name()), zap.Error(err))
 			continue
 		}
 		nodePeersGauge.With(labels).Inc()
diff --git a/services/wallet/collectibles/service.go b/services/wallet/collectibles/service.go
index b037f854b62..2ef662c0ddf 100644
--- a/services/wallet/collectibles/service.go
+++ b/services/wallet/collectibles/service.go
@@ -349,7 +349,7 @@ func (s *Service) sendResponseEvent(requestID *int32, eventType walletevent.Even
 	}
 
 	logutils.ZapLogger().Debug("wallet.api.collectibles.Service RESPONSE",
-		zap.Int32("requestID", *requestID),
+		zap.Any("requestID", requestID),
 		zap.String("eventType", string(eventType)),
 		zap.Int("payload.len", len(payload)),
 		zap.Error(err),
diff --git a/services/web3provider/api_test.go b/services/web3provider/api_test.go
index fe815a2121d..0602269fb11 100644
--- a/services/web3provider/api_test.go
+++ b/services/web3provider/api_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
+	"go.uber.org/zap"
 
 	"github.com/status-im/status-go/account"
 	"github.com/status-im/status-go/appdatabase"
@@ -54,7 +55,9 @@ func setupTestAPI(t *testing.T) (*API, func()) {
 	utils.Init()
 	require.NoError(t, utils.ImportTestAccount(keyStoreDir, utils.GetAccount1PKFile()))
 
-	accManager := account.NewGethManager()
+	logger, err := zap.NewDevelopment()
+	require.NoError(t, err)
+	accManager := account.NewGethManager(logger)
 
 	nodeConfig := &params.NodeConfig{
 		KeyStoreDir: keyStoreDir,
diff --git a/wakuv2/api.go b/wakuv2/api.go
index 163ce9083d0..09ea54ae03b 100644
--- a/wakuv2/api.go
+++ b/wakuv2/api.go
@@ -26,9 +26,10 @@ import (
 	"sync"
 	"time"
 
+	"go.uber.org/zap"
+
 	"github.com/waku-org/go-waku/waku/v2/payload"
 	"github.com/waku-org/go-waku/waku/v2/protocol/pb"
-	"go.uber.org/zap"
 
 	"github.com/status-im/status-go/logutils"
 	"github.com/status-im/status-go/wakuv2/common"
diff --git a/wakuv2/common/message.go b/wakuv2/common/message.go
index 3d2bad8ed56..58521ae75c7 100644
--- a/wakuv2/common/message.go
+++ b/wakuv2/common/message.go
@@ -6,9 +6,10 @@ import (
 	"sync/atomic"
 	"time"
 
+	"go.uber.org/zap"
+
 	"github.com/waku-org/go-waku/waku/v2/payload"
 	"github.com/waku-org/go-waku/waku/v2/protocol"
-	"go.uber.org/zap"
 
 	"github.com/status-im/status-go/logutils"