push duplicated logic to helper

rpc/types_transaction.go

@@ -255,16 +255,9 @@ func (txn *UnknownTransaction) UnmarshalJSON(data []byte) error {
 		return err
 	}
 	// BlockWithReceipts swrap transaction in the Transaction field.
-	if dec["Transaction"] != nil {
-		var decInner map[string]interface{}
-		txnInner, err := json.Marshal(dec["Transaction"])
-		if err != nil {
-			return err
-		}
-		if err := json.Unmarshal(txnInner, &decInner); err != nil {
-			return err
-		}
-		dec = decInner
+	dec, err := utils.UnwrapJSON(dec, "Transaction")
+	if err != nil {
+		return err
 	}
 
 	t, err := unmarshalTxn(dec)

rpc/types_transaction_receipt.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 
 	"github.com/NethermindEth/juno/core/felt"
+	"github.com/NethermindEth/starknet.go/utils"
 )
 
 type FeePayment struct {
@@ -361,16 +362,9 @@ func (tr *UnknownTransactionReceipt) UnmarshalJSON(data []byte) error {
 	}
 
 	// BlockWithReceipts wrap receipts in the TransactionReceipt field.
-	if dec["TransactionReceipt"] != nil {
-		var decInner map[string]interface{}
-		recInner, err := json.Marshal(dec["TransactionReceipt"])
-		if err != nil {
-			return err
-		}
-		if err := json.Unmarshal(recInner, &decInner); err != nil {
-			return err
-		}
-		dec = decInner
+	dec, err := utils.UnwrapJSON(dec, "TransactionReceipt")
+	if err != nil {
+		return err
 	}
 
 	t, err := unmarshalTransactionReceipt(dec)

utils/data.go

@@ -0,0 +1,18 @@
+package utils
+
+import "encoding/json"
+
+func UnwrapJSON(data map[string]interface{}, tag string) (map[string]interface{}, error) {
+	if data[tag] != nil {
+		var unwrappedData map[string]interface{}
+		dataInner, err := json.Marshal(data[tag])
+		if err != nil {
+			return nil, err
+		}
+		if err := json.Unmarshal(dataInner, &unwrappedData); err != nil {
+			return nil, err
+		}
+		return unwrappedData, nil
+	}
+	return data, nil
+}