From ceccca79cc78c27aa4b6c9870668e82189d10c0d Mon Sep 17 00:00:00 2001
From: vitaliyb <vitaliy.bashlak@ideasoft.io>
Date: Wed, 15 Jan 2025 19:59:49 +0200
Subject: [PATCH] Fix lint

---
 .../evm/jsonrpc/jsonrpctest/jsonrpc_test.go   | 13 ++++++++-----
 packages/evm/jsonrpc/tracer_call.go           | 19 +++++++++----------
 packages/evm/jsonrpc/tracer_prestate.go       |  9 ++++++---
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/evm/jsonrpc/jsonrpctest/jsonrpc_test.go b/packages/evm/jsonrpc/jsonrpctest/jsonrpc_test.go
index cbfdd90334..20f3aef73f 100644
--- a/packages/evm/jsonrpc/jsonrpctest/jsonrpc_test.go
+++ b/packages/evm/jsonrpc/jsonrpctest/jsonrpc_test.go
@@ -628,20 +628,23 @@ func TestRPCTraceEVMDeposit(t *testing.T) {
 	require.EqualValues(t, types.ReceiptStatusSuccessful, rc.Status)
 
 	t.Run("callTracer_tx", func(t *testing.T) {
-		trace, err := env.traceTransactionWithCallTracer(tx.Hash())
+		var trace jsonrpc.CallFrame
+		trace, err = env.traceTransactionWithCallTracer(tx.Hash())
 		require.NoError(t, err)
 		require.Equal(t, evmAddr.String(), trace.To.String())
 		require.Equal(t, hexutil.EncodeUint64(isc.NewAssetsBaseTokens(1000).BaseTokens*1e12), trace.Value.String())
 	})
 
 	t.Run("prestateTracer_tx", func(t *testing.T) {
-		prestate, err := env.traceTransactionWithPrestate(tx.Hash())
+		var prestate jsonrpc.PrestateAccountMap
+		prestate, err = env.traceTransactionWithPrestate(tx.Hash())
 		require.NoError(t, err)
 		require.Empty(t, prestate)
 	})
 
 	t.Run("prestateTracerDiff_tx", func(t *testing.T) {
-		prestateDiff, err := env.traceTransactionWithPrestateDiff(tx.Hash())
+		var prestateDiff jsonrpc.PrestateDiffResult
+		prestateDiff, err = env.traceTransactionWithPrestateDiff(tx.Hash())
 		require.NoError(t, err)
 		require.Empty(t, prestateDiff.Pre)
 		require.Empty(t, prestateDiff.Post)
@@ -660,7 +663,7 @@ func TestRPCTraceEVMDeposit(t *testing.T) {
 		)
 		require.NoError(t, err)
 
-		var traces = make([]jsonrpc.TxTraceResult, 0)
+		traces := make([]jsonrpc.TxTraceResult, 0)
 		err = json.Unmarshal(res1, &traces)
 		require.NoError(t, err)
 		require.Len(t, traces, 1)
@@ -686,7 +689,7 @@ func TestRPCTraceEVMDeposit(t *testing.T) {
 		)
 		require.NoError(t, err)
 
-		var traces = make([]jsonrpc.TxTraceResult, 0)
+		traces := make([]jsonrpc.TxTraceResult, 0)
 		err = json.Unmarshal(res1, &traces)
 		require.NoError(t, err)
 		require.Len(t, traces, 1)
diff --git a/packages/evm/jsonrpc/tracer_call.go b/packages/evm/jsonrpc/tracer_call.go
index 80ccb9565a..da69b5ec55 100644
--- a/packages/evm/jsonrpc/tracer_call.go
+++ b/packages/evm/jsonrpc/tracer_call.go
@@ -291,7 +291,6 @@ var ErrIncorrectTopLevelCalls = errors.New("incorrect number of top-level calls"
 // error arising from the encoding or forceful termination (via `Stop`).
 func (t *callTracer) GetResult() (json.RawMessage, error) {
 	if t.traceBlock {
-
 		// otherwise return all call frames
 		results := make([]TxTraceResult, 0, len(t.txToStack))
 		for txHash, stack := range t.txToStack {
@@ -318,18 +317,18 @@ func (t *callTracer) GetResult() (json.RawMessage, error) {
 			return nil, err
 		}
 		return res, t.reason
-	} else {
-		if len(t.txToStack) != 1 {
-			return nil, ErrIncorrectTopLevelCalls
-		}
+	}
 
-		res, err := json.Marshal(t.txToStack[t.currentTx][0])
-		if err != nil {
-			return nil, err
-		}
+	if len(t.txToStack) != 1 {
+		return nil, ErrIncorrectTopLevelCalls
+	}
 
-		return res, t.reason
+	res, err := json.Marshal(t.txToStack[t.currentTx][0])
+	if err != nil {
+		return nil, err
 	}
+
+	return res, t.reason
 }
 
 // Stop terminates execution of the tracer at the first opportune moment.
diff --git a/packages/evm/jsonrpc/tracer_prestate.go b/packages/evm/jsonrpc/tracer_prestate.go
index 69992ead44..134013eb82 100644
--- a/packages/evm/jsonrpc/tracer_prestate.go
+++ b/packages/evm/jsonrpc/tracer_prestate.go
@@ -203,7 +203,8 @@ func (t *prestateTracer) GetResult() (json.RawMessage, error) {
 		if t.config.DiffMode {
 			result := []TxTraceResult{}
 			for txHash, txState := range t.states {
-				diffResult, err := json.Marshal(PrestateDiffResult{txState.Post, txState.Pre})
+				var diffResult json.RawMessage
+				diffResult, err = json.Marshal(PrestateDiffResult{txState.Post, txState.Pre})
 				if err != nil {
 					return nil, err
 				}
@@ -221,7 +222,8 @@ func (t *prestateTracer) GetResult() (json.RawMessage, error) {
 		} else {
 			result := []TxTraceResult{}
 			for txHash, txState := range t.states {
-				preState, err := json.Marshal(txState.Pre)
+				var preState json.RawMessage
+				preState, err = json.Marshal(txState.Pre)
 				if err != nil {
 					return nil, err
 				}
@@ -229,7 +231,8 @@ func (t *prestateTracer) GetResult() (json.RawMessage, error) {
 			}
 
 			for _, tx := range t.fakeTxs {
-				csJSON, err := t.TraceFakeTx(tx)
+				var csJSON json.RawMessage
+				csJSON, err = t.TraceFakeTx(tx)
 				if err != nil {
 					return nil, err
 				}