Skip to content

Commit 067d9c6

Browse files
osmaczkoosmaczko
committed
chore_: replace geth logger with zap logger in geth_backend
iterates: status-im/status-desktop#16511
1 parent 7971fd3 commit 067d9c6

File tree

13 files changed

+132
-75
lines changed

13 files changed

+132
-75
lines changed

‎api/backend_test.go

+57-21
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919

2020
"github.com/stretchr/testify/assert"
2121
"github.com/stretchr/testify/require"
22+
"go.uber.org/zap"
2223

2324
gethcrypto "github.com/ethereum/go-ethereum/crypto"
2425

@@ -90,12 +91,23 @@ func setupTestMultiDB() (*multiaccounts.Database, func() error, error) {
9091
}, nil
9192
}
9293

94+
func newGethStatusBackend() (*GethStatusBackend, error) {
95+
logger, err := zap.NewDevelopment()
96+
if err != nil {
97+
return nil, err
98+
}
99+
return NewGethStatusBackend(logger), nil
100+
}
101+
93102
func setupGethStatusBackend() (*GethStatusBackend, func() error, func() error, func() error, error) {
94103
db, stop1, err := setupTestDB()
95104
if err != nil {
96105
return nil, nil, nil, nil, err
97106
}
98-
backend := NewGethStatusBackend()
107+
backend, err := newGethStatusBackend()
108+
if err != nil {
109+
return nil, nil, nil, nil, err
110+
}
99111
backend.StatusNode().SetAppDB(db)
100112

101113
ma, stop2, err := setupTestMultiDB()
@@ -292,7 +304,9 @@ func TestBackendGettersConcurrently(t *testing.T) {
292304

293305
func TestBackendConnectionChangesConcurrently(t *testing.T) {
294306
connections := [...]string{connection.Wifi, connection.Cellular, connection.Unknown}
295-
backend := NewGethStatusBackend()
307+
backend, err := newGethStatusBackend()
308+
require.NoError(t, err)
309+
296310
count := 3
297311

298312
var wg sync.WaitGroup
@@ -310,7 +324,9 @@ func TestBackendConnectionChangesConcurrently(t *testing.T) {
310324
}
311325

312326
func TestBackendConnectionChangesToOffline(t *testing.T) {
313-
b := NewGethStatusBackend()
327+
b, err := newGethStatusBackend()
328+
require.NoError(t, err)
329+
314330
b.ConnectionChange(connection.None, false)
315331
assert.True(t, b.connectionState.Offline)
316332

@@ -386,7 +402,8 @@ func TestBackendCallRPCConcurrently(t *testing.T) {
386402
}
387403

388404
func TestAppStateChange(t *testing.T) {
389-
backend := NewGethStatusBackend()
405+
backend, err := newGethStatusBackend()
406+
require.NoError(t, err)
390407

391408
var testCases = []struct {
392409
name string
@@ -460,7 +477,8 @@ func TestBlockedRPCMethods(t *testing.T) {
460477
}
461478

462479
func TestCallRPCWithStoppedNode(t *testing.T) {
463-
backend := NewGethStatusBackend()
480+
backend, err := newGethStatusBackend()
481+
require.NoError(t, err)
464482

465483
resp, err := backend.CallRPC(
466484
`{"jsonrpc":"2.0","method":"web3_clientVersion","params":[],"id":1}`,
@@ -699,7 +717,9 @@ func TestBackendGetVerifiedAccount(t *testing.T) {
699717
func TestRuntimeLogLevelIsNotWrittenToDatabase(t *testing.T) {
700718
utils.Init()
701719

702-
b := NewGethStatusBackend()
720+
b, err := newGethStatusBackend()
721+
require.NoError(t, err)
722+
703723
chatKey, err := gethcrypto.GenerateKey()
704724
require.NoError(t, err)
705725
walletKey, err := gethcrypto.GenerateKey()
@@ -767,7 +787,9 @@ func TestRuntimeLogLevelIsNotWrittenToDatabase(t *testing.T) {
767787
func TestLoginWithKey(t *testing.T) {
768788
utils.Init()
769789

770-
b := NewGethStatusBackend()
790+
b, err := newGethStatusBackend()
791+
require.NoError(t, err)
792+
771793
chatKey, err := gethcrypto.GenerateKey()
772794
require.NoError(t, err)
773795
walletKey, err := gethcrypto.GenerateKey()
@@ -825,7 +847,9 @@ func TestLoginAccount(t *testing.T) {
825847
tmpdir := t.TempDir()
826848
nameserver := "8.8.8.8"
827849

828-
b := NewGethStatusBackend()
850+
b, err := newGethStatusBackend()
851+
require.NoError(t, err)
852+
829853
createAccountRequest := &requests.CreateAccount{
830854
DisplayName: "some-display-name",
831855
CustomizationColor: "#ffffff",
@@ -882,7 +906,9 @@ func TestLoginAccount(t *testing.T) {
882906
func TestVerifyDatabasePassword(t *testing.T) {
883907
utils.Init()
884908

885-
b := NewGethStatusBackend()
909+
b, err := newGethStatusBackend()
910+
require.NoError(t, err)
911+
886912
chatKey, err := gethcrypto.GenerateKey()
887913
require.NoError(t, err)
888914
walletKey, err := gethcrypto.GenerateKey()
@@ -920,15 +946,16 @@ func TestVerifyDatabasePassword(t *testing.T) {
920946
}
921947

922948
func TestDeleteMultiaccount(t *testing.T) {
923-
backend := NewGethStatusBackend()
949+
backend, err := newGethStatusBackend()
950+
require.NoError(t, err)
924951

925952
rootDataDir := t.TempDir()
926953

927954
keyStoreDir := filepath.Join(rootDataDir, "keystore")
928955

929956
backend.rootDataDir = rootDataDir
930957

931-
err := backend.AccountManager().InitKeystore(keyStoreDir)
958+
err = backend.AccountManager().InitKeystore(keyStoreDir)
932959
require.NoError(t, err)
933960

934961
backend.AccountManager()
@@ -1279,7 +1306,8 @@ func loginDesktopUser(t *testing.T, conf *params.NodeConfig) {
12791306
username := "TestUser"
12801307
passwd := "0xC888C9CE9E098D5864D3DED6EBCC140A12142263BACE3A23A36F9905F12BD64A" // #nosec G101
12811308

1282-
b := NewGethStatusBackend()
1309+
b, err := newGethStatusBackend()
1310+
require.NoError(t, err)
12831311

12841312
require.NoError(t, b.AccountManager().InitKeystore(conf.KeyStoreDir))
12851313
b.UpdateRootDataDir(conf.DataDir)
@@ -1328,7 +1356,8 @@ func TestChangeDatabasePassword(t *testing.T) {
13281356
oldPassword := "password"
13291357
newPassword := "newPassword"
13301358

1331-
backend := NewGethStatusBackend()
1359+
backend, err := newGethStatusBackend()
1360+
require.NoError(t, err)
13321361
backend.UpdateRootDataDir(t.TempDir())
13331362

13341363
// Setup keystore to test decryption of it
@@ -1385,7 +1414,8 @@ func TestCreateWallet(t *testing.T) {
13851414
password := "some-password2" // nolint: goconst
13861415
tmpdir := t.TempDir()
13871416

1388-
b := NewGethStatusBackend()
1417+
b, err := newGethStatusBackend()
1418+
require.NoError(t, err)
13891419
defer func() {
13901420
require.NoError(t, b.StopNode())
13911421
}()
@@ -1450,7 +1480,8 @@ func TestSetFleet(t *testing.T) {
14501480
password := "some-password2" // nolint: goconst
14511481
tmpdir := t.TempDir()
14521482

1453-
b := NewGethStatusBackend()
1483+
b, err := newGethStatusBackend()
1484+
require.NoError(t, err)
14541485
createAccountRequest := &requests.CreateAccount{
14551486
DisplayName: "some-display-name",
14561487
CustomizationColor: "#ffffff",
@@ -1519,7 +1550,8 @@ func TestWalletConfigOnLoginAccount(t *testing.T) {
15191550
raribleMainnetAPIKey := "rarible-mainnet-api-key" // nolint: gosec
15201551
raribleTestnetAPIKey := "rarible-testnet-api-key" // nolint: gosec
15211552

1522-
b := NewGethStatusBackend()
1553+
b, err := newGethStatusBackend()
1554+
require.NoError(t, err)
15231555
createAccountRequest := &requests.CreateAccount{
15241556
DisplayName: "some-display-name",
15251557
CustomizationColor: "#ffffff",
@@ -1584,7 +1616,8 @@ func TestTestnetEnabledSettingOnCreateAccount(t *testing.T) {
15841616
utils.Init()
15851617
tmpdir := t.TempDir()
15861618

1587-
b := NewGethStatusBackend()
1619+
b, err := newGethStatusBackend()
1620+
require.NoError(t, err)
15881621

15891622
// Creating an account with test networks enabled
15901623
createAccountRequest1 := &requests.CreateAccount{
@@ -1595,7 +1628,7 @@ func TestTestnetEnabledSettingOnCreateAccount(t *testing.T) {
15951628
LogFilePath: tmpdir + "/log",
15961629
TestNetworksEnabled: true,
15971630
}
1598-
_, err := b.CreateAccountAndLogin(createAccountRequest1)
1631+
_, err = b.CreateAccountAndLogin(createAccountRequest1)
15991632
require.NoError(t, err)
16001633
statusNode := b.statusNode
16011634
require.NotNil(t, statusNode)
@@ -1630,7 +1663,8 @@ func TestRestoreAccountAndLogin(t *testing.T) {
16301663
utils.Init()
16311664
tmpdir := t.TempDir()
16321665

1633-
backend := NewGethStatusBackend()
1666+
backend, err := newGethStatusBackend()
1667+
require.NoError(t, err)
16341668

16351669
// Test case 1: Valid restore account request
16361670
restoreRequest := &requests.RestoreAccount{
@@ -1665,7 +1699,8 @@ func TestRestoreAccountAndLoginWithoutDisplayName(t *testing.T) {
16651699
utils.Init()
16661700
tmpdir := t.TempDir()
16671701

1668-
backend := NewGethStatusBackend()
1702+
backend, err := newGethStatusBackend()
1703+
require.NoError(t, err)
16691704

16701705
// Test case: Valid restore account request without DisplayName
16711706
restoreRequest := &requests.RestoreAccount{
@@ -1828,7 +1863,8 @@ func TestRestoreKeycardAccountAndLogin(t *testing.T) {
18281863
conf, err := params.NewNodeConfig(tmpdir, 1777)
18291864
require.NoError(t, err)
18301865

1831-
backend := NewGethStatusBackend()
1866+
backend, err := newGethStatusBackend()
1867+
require.NoError(t, err)
18321868

18331869
require.NoError(t, backend.AccountManager().InitKeystore(conf.KeyStoreDir))
18341870
backend.UpdateRootDataDir(conf.DataDir)

‎api/create_account_and_login_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"time"
88

99
"github.com/stretchr/testify/require"
10+
"go.uber.org/zap"
1011

1112
"github.com/status-im/status-go/protocol/requests"
1213
)
@@ -43,7 +44,9 @@ func TestCreateAccountAndLogin(t *testing.T) {
4344
var request requests.CreateAccount
4445
err := json.Unmarshal([]byte(requestJSON), &request)
4546
require.NoError(t, err)
46-
statusBackend := NewGethStatusBackend()
47+
logger, err := zap.NewDevelopment()
48+
require.NoError(t, err)
49+
statusBackend := NewGethStatusBackend(logger)
4750
_, err = statusBackend.CreateAccountAndLogin(&request)
4851
require.NoError(t, err)
4952
t.Logf("TestCreateAccountAndLogin: create account user1 and login successfully")

0 commit comments

Comments
 (0)