Complete adaptTransaction()

rpcv02/client.go

@@ -3,7 +3,6 @@ package rpcv02
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 )
 
 type callCloser interface {
@@ -21,9 +20,7 @@ func do(ctx context.Context, call callCloser, method string, data interface{}, a
 		return errNotFound
 	}
 	if err := json.Unmarshal(raw, &data); err != nil {
-		fmt.Println("--e", string(raw))
 		return err
 	}
-	fmt.Println("--------", string(raw))
 	return nil
 }

rpcv02/transaction.go

@@ -9,18 +9,31 @@ import (
 	"github.com/NethermindEth/juno/core/felt"
 )
 
-func adaptTransaction(t TXN) (Transaction, error) { // todo: update to return *Transaction
-	fmt.Println("************************", t)
+func adaptTransaction(t TXN) (Transaction, error) {
+	txMarshalled, err := json.Marshal(t)
+	if err != nil {
+		return nil, err
+	}
 	switch t.Type {
 	case TransactionType_Invoke:
 		var tx InvokeTxnV1
-		txMarshalled, err := json.Marshal(t)
-		if err != nil {
-			return nil, err
-		}
 		json.Unmarshal(txMarshalled, &tx)
-		fmt.Println(t)
-		fmt.Println(tx)
+		return tx, nil
+	case TransactionType_Declare:
+		var tx DeclareTxn
+		json.Unmarshal(txMarshalled, &tx)
+		return tx, nil
+	case TransactionType_DeployAccount:
+		var tx DeployAccountTxn
+		json.Unmarshal(txMarshalled, &tx)
+		return tx, nil
+	case TransactionType_L1Handler:
+		var tx L1HandlerTxn
+		json.Unmarshal(txMarshalled, &tx)
+		return tx, nil
+	case TransactionType_Deploy:
+		var tx DeployTxn
+		json.Unmarshal(txMarshalled, &tx)
 		return tx, nil
 	default:
 		panic("not a transaction")