From 0ded3ee6fe3cb6b53d8f42052843c23aabdb045b Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Thu, 12 Jan 2023 16:33:06 +0100
Subject: [PATCH] abi.go: move DecodeAction to ship_processor.

---
 abi.go            | 12 ------------
 ship_processor.go | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/abi.go b/abi.go
index 38631cd..2d4a62e 100644
--- a/abi.go
+++ b/abi.go
@@ -41,15 +41,3 @@ func GetAbi(account eos.AccountName) (*eos.ABI, error) {
 	}
 	return abi, nil
 }
-
-func DecodeAction(abi *eos.ABI, data []byte, actionName eos.ActionName) (interface{}, error) {
-	var v interface{}
-
-	bytes, err := abi.DecodeAction(data, actionName)
-	if err != nil {
-		return v, err
-	}
-
-	err = json.Unmarshal(bytes, &v)
-	return v, err
-}
diff --git a/ship_processor.go b/ship_processor.go
index 9647302..e6f91d8 100644
--- a/ship_processor.go
+++ b/ship_processor.go
@@ -7,9 +7,22 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"eosio-ship-trace-reader/internal/redis"
+	"github.com/eoscanada/eos-go"
 	"github.com/eoscanada/eos-go/ship"
 )
 
+func decodeAction(abi *eos.ABI, data []byte, actionName eos.ActionName) (interface{}, error) {
+	var v interface{}
+
+	bytes, err := abi.DecodeAction(data, actionName)
+	if err != nil {
+		return v, err
+	}
+
+	err = json.Unmarshal(bytes, &v)
+	return v, err
+}
+
 func encodeMessage(v interface{}) ([]byte, bool) {
 	payload, err := json.Marshal(v)
 	if err != nil {
@@ -80,7 +93,7 @@ func processTraces(traces []*ship.TransactionTraceV0) {
 
 			abi, err := GetAbi(act_trace.Act.Account)
 			if err == nil {
-				v, err := DecodeAction(abi, act_trace.Act.Data, act_trace.Act.Name)
+				v, err := decodeAction(abi, act_trace.Act.Data, act_trace.Act.Name)
 				if err != nil {
 					log.WithError(err).Warn("Failed to decode action")
 				}