From 120c2acdc6a5b1a35f3c5ead863eedc0b3f63ec3 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Tue, 26 Nov 2024 06:52:14 +0100
Subject: [PATCH] internal/server/ship_processor.go: refactor
 processDeltaRows() to reduce nested blocks

---
 internal/server/ship_processor.go | 65 +++++++++++++++++--------------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/internal/server/ship_processor.go b/internal/server/ship_processor.go
index a722722..1c1ee39 100644
--- a/internal/server/ship_processor.go
+++ b/internal/server/ship_processor.go
@@ -2,6 +2,7 @@ package server
 
 import (
 	"bytes"
+	"errors"
 
 	"github.com/eosswedenorg/thalos/api/message"
 	"github.com/eosswedenorg/thalos/internal/abi"
@@ -228,41 +229,47 @@ func (processor *ShipProcessor) proccessActionTrace(logger *log.Entry, trace *sh
 func (processor *ShipProcessor) proccessDeltaRows(logger *log.Entry, table_name string, rows []ship.Row) []message.TableDeltaRow {
 	out := []message.TableDeltaRow{}
 	for _, row := range rows {
-
-		msg := message.TableDeltaRow{
-			Present: row.Present,
-			RawData: row.Data,
-		}
-
-		if processor.shipABI != nil {
-			v, err := processor.shipABI.Decode(bytes.NewReader(row.Data), table_name)
-			if err == nil {
-				data, err := ship_helper.ParseTableDeltaData(v)
-				if err == nil {
-					// Decode contract row data
-					if table_name == "contract_row" {
-						dec, err := ship_helper.DecodeContractRow(processor.abi, data)
-						if err != nil {
-							logger.WithError(err).Warn("Failed to decode contract row")
-						} else {
-							data["value"] = dec
-						}
-					}
-					msg.Data = data
-				} else {
-					logger.WithError(err).Error("Failed to parse table delta data")
-				}
-			} else {
-				logger.WithError(err).Error("Failed to decode table delta")
-			}
-		} else {
-			logger.Warn("No SHIP ABI present")
+		msg, err := processor.proccessDeltaRow(row, table_name)
+		if err != nil {
+			logger.WithError(err).Warn("Failed to processs table delta row")
 		}
 		out = append(out, msg)
 	}
 	return out
 }
 
+func (processor *ShipProcessor) proccessDeltaRow(row ship.Row, table_name string) (message.TableDeltaRow, error) {
+	msg := message.TableDeltaRow{
+		Present: row.Present,
+		RawData: row.Data,
+	}
+
+	if processor.shipABI == nil {
+		return msg, errors.New("No SHIP ABI present")
+	}
+
+	v, err := processor.shipABI.Decode(bytes.NewReader(row.Data), table_name)
+	if err != nil {
+		return msg, errors.New("Failed to decode table delta")
+	}
+	data, err := ship_helper.ParseTableDeltaData(v)
+	if err != nil {
+		return msg, errors.New("Failed to parse table delta data")
+	}
+
+	msg.Data = data
+
+	// Decode contract row data
+	if table_name == "contract_row" {
+		dec, err := ship_helper.DecodeContractRow(processor.abi, data)
+		if err != nil {
+			return msg, errors.New("Failed to decode contract row")
+		}
+		msg.Data["value"] = dec
+	}
+	return msg, nil
+}
+
 // Callback function called by shipclient.Stream when a new block arrives.
 func (processor *ShipProcessor) processBlock(blockResult *ship.GetBlocksResultV0) {
 	block := ship.SignedBlock{}