From 869afe0ca3856d2349e06f54387782ea1336d5d3 Mon Sep 17 00:00:00 2001
From: Dusan Nosovic <dusan.nosovic@ethernal.tech>
Date: Fri, 9 Feb 2024 08:59:31 +0100
Subject: [PATCH] test and lint fix

---
 jsonrpc/txpool_endpoint_test.go | 12 ++++++------
 types/access_list_tx.go         |  5 ++++-
 types/dynamic_fee_tx.go         |  4 +++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/jsonrpc/txpool_endpoint_test.go b/jsonrpc/txpool_endpoint_test.go
index df9260adb7..2941a81e14 100644
--- a/jsonrpc/txpool_endpoint_test.go
+++ b/jsonrpc/txpool_endpoint_test.go
@@ -49,8 +49,8 @@ func TestContentEndpoint(t *testing.T) {
 		assert.NotNil(t, txData)
 		assert.Equal(t, testTx1.Gas(), uint64(txData.Gas))
 		assert.Equal(t, *(testTx1.GasPrice()), big.Int(*txData.GasPrice))
-		assert.Equal(t, *(testTx1.GasFeeCap()), big.Int(*txData.GasFeeCap))
-		assert.Equal(t, *(testTx1.GasTipCap()), big.Int(*txData.GasTipCap))
+		assert.Equal(t, *(testTx1.GasFeeCap()), big.Int(*txData.GasPrice))
+		assert.Equal(t, *(testTx1.GasTipCap()), big.Int(*txData.GasPrice))
 		assert.Equal(t, testTx1.To(), txData.To)
 		assert.Equal(t, testTx1.From(), txData.From)
 		assert.Equal(t, *(testTx1.Value()), big.Int(txData.Value))
@@ -62,7 +62,7 @@ func TestContentEndpoint(t *testing.T) {
 		assert.NotNil(t, txData)
 		assert.Equal(t, (argUint64)(types.DynamicFeeTxType), txData.Type)
 		assert.Equal(t, testTx2.Gas(), uint64(txData.Gas))
-		assert.Equal(t, (*testTx2.GasPrice()), big.Int(*txData.GasPrice))
+		assert.Equal(t, (*testTx2.GasPrice()), big.Int(*txData.GasFeeCap))
 		assert.Equal(t, *(testTx2.GasFeeCap()), big.Int(*txData.GasFeeCap))
 		assert.Equal(t, *(testTx2.GasTipCap()), big.Int(*txData.GasTipCap))
 		assert.Equal(t, testTx2.To(), txData.To)
@@ -98,8 +98,8 @@ func TestContentEndpoint(t *testing.T) {
 		assert.NotNil(t, txData)
 		assert.Equal(t, testTx1.Gas(), uint64(txData.Gas))
 		assert.Equal(t, *(testTx1.GasPrice()), big.Int(*txData.GasPrice))
-		assert.Equal(t, *(testTx1.GasFeeCap()), big.Int(*txData.GasFeeCap))
-		assert.Equal(t, *(testTx1.GasTipCap()), big.Int(*txData.GasTipCap))
+		assert.Equal(t, *(testTx1.GasFeeCap()), big.Int(*txData.GasPrice))
+		assert.Equal(t, *(testTx1.GasTipCap()), big.Int(*txData.GasPrice))
 		assert.Equal(t, testTx1.To(), txData.To)
 		assert.Equal(t, testTx1.From(), txData.From)
 		assert.Equal(t, *(testTx1.Value()), big.Int(txData.Value))
@@ -111,7 +111,7 @@ func TestContentEndpoint(t *testing.T) {
 		assert.NotNil(t, txData)
 		assert.Equal(t, (argUint64)(types.DynamicFeeTxType), txData.Type)
 		assert.Equal(t, testTx2.Gas(), uint64(txData.Gas))
-		assert.Equal(t, *(testTx2.GasPrice()), big.Int(*txData.GasPrice))
+		assert.Equal(t, *(testTx2.GasPrice()), big.Int(*txData.GasFeeCap))
 		assert.Equal(t, *(testTx2.GasFeeCap()), big.Int(*txData.GasFeeCap))
 		assert.Equal(t, *(testTx2.GasTipCap()), big.Int(*txData.GasTipCap))
 		assert.Equal(t, testTx2.To(), txData.To)
diff --git a/types/access_list_tx.go b/types/access_list_tx.go
index 44baf033ce..efdadb4b35 100644
--- a/types/access_list_tx.go
+++ b/types/access_list_tx.go
@@ -100,6 +100,7 @@ func (al TxAccessList) marshallRLPWith(arena *fastrlp.Arena) *fastrlp.Value {
 		accessTupleVV.Set(storageKeysVV)
 		accessListVV.Set(accessTupleVV)
 	}
+
 	return accessListVV
 }
 
@@ -291,7 +292,9 @@ func (tx *AccessListTxn) unmarshalRLPFrom(p *fastrlp.Parser, v *fastrlp.Value) e
 		txAccessList = make(TxAccessList, len(accessListVV))
 	}
 
-	txAccessList.unmarshallRLPFrom(p, accessListVV)
+	if err = txAccessList.unmarshallRLPFrom(p, accessListVV); err != nil {
+		return err
+	}
 
 	tx.setAccessList(txAccessList)
 
diff --git a/types/dynamic_fee_tx.go b/types/dynamic_fee_tx.go
index 4f360c822f..12dc491025 100644
--- a/types/dynamic_fee_tx.go
+++ b/types/dynamic_fee_tx.go
@@ -192,7 +192,9 @@ func (tx *DynamicFeeTx) unmarshalRLPFrom(p *fastrlp.Parser, v *fastrlp.Value) er
 		txAccessList = make(TxAccessList, len(accessListVV))
 	}
 
-	txAccessList.unmarshallRLPFrom(p, accessListVV)
+	if err = txAccessList.unmarshallRLPFrom(p, accessListVV); err != nil {
+		return err
+	}
 
 	tx.setAccessList(txAccessList)