From 1b5054a5ed08ad14ae7a45ed1d2fcc18dc72a80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Ramon=20Ma=C3=B1es?= <jose@celestia.org>
Date: Wed, 25 Oct 2023 12:26:08 +0200
Subject: [PATCH] feat(torch): fix error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jose Ramon Mañes <jose@celestia.org>
---
 pkg/http/router.go          |  5 ----
 pkg/http/server.go          | 47 +++++++++++++++++++------------------
 pkg/nodes/consensus_test.go |  3 +--
 pkg/nodes/da.go             |  2 +-
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/pkg/http/router.go b/pkg/http/router.go
index c4dcc65..c1e1be0 100644
--- a/pkg/http/router.go
+++ b/pkg/http/router.go
@@ -34,11 +34,6 @@ func Router(r *mux.Router, cfg config.MutualPeersConfig) *mux.Router {
 		Gen(w, r, cfg)
 	}).Methods("POST")
 
-	// comment this endpoint for now.
-	//s.HandleFunc("/genAll", func(w http.ResponseWriter, r *http.Request) {
-	//	GenAll(w, r, cfg)
-	//}).Methods("POST")
-
 	// metrics
 	r.Handle("/metrics", promhttp.Handler())
 
diff --git a/pkg/http/server.go b/pkg/http/server.go
index 9fc2822..206387e 100644
--- a/pkg/http/server.go
+++ b/pkg/http/server.go
@@ -28,7 +28,7 @@ func GetHttpPort() string {
 	// Ensure that the provided port is a valid numeric value
 	_, err := strconv.Atoi(port)
 	if err != nil {
-		log.Error("Invalid HTTP_PORT value: %v. Using default port 8080")
+		log.Error("Invalid HTTP_PORT [", os.Getenv("HTTP_PORT"), "] ,using default port 8080")
 		return "8080"
 	}
 
@@ -115,25 +115,26 @@ func GenerateHashMetrics(cfg config.MutualPeersConfig, err error) bool {
 	return false
 }
 
-// RegisterMetrics generates and registers the metrics for all nodes in the configuration.
-func RegisterMetrics(cfg config.MutualPeersConfig) error {
-	log.Info("Generating initial metrics for all the nodes...")
-
-	var nodeNames []string
-
-	// Adding nodes from config to register the initial metrics
-	for _, n := range cfg.MutualPeers {
-		for _, no := range n.Peers {
-			nodeNames = append(nodeNames, no.NodeName)
-		}
-	}
-
-	// Generate the metrics for all nodes
-	_, err := nodes.GenerateAllTrustedPeersAddr(cfg, nodeNames)
-	if err != nil {
-		log.Errorf("Error GenerateAllTrustedPeersAddr: %v", err)
-		return err
-	}
-
-	return nil
-}
+//
+//// RegisterMetrics generates and registers the metrics for all nodes in the configuration.
+//func RegisterMetrics(cfg config.MutualPeersConfig) error {
+//	log.Info("Generating initial metrics for all the nodes...")
+//
+//	var nodeNames []string
+//
+//	// Adding nodes from config to register the initial metrics
+//	for _, n := range cfg.MutualPeers {
+//		for _, no := range n.Peers {
+//			nodeNames = append(nodeNames, no.NodeName)
+//		}
+//	}
+//
+//	// Generate the metrics for all nodes
+//	_, err := nodes.GenerateAllTrustedPeersAddr(cfg, nodeNames)
+//	if err != nil {
+//		log.Errorf("Error GenerateAllTrustedPeersAddr: %v", err)
+//		return err
+//	}
+//
+//	return nil
+//}
diff --git a/pkg/nodes/consensus_test.go b/pkg/nodes/consensus_test.go
index 56a1bf8..bfcd893 100644
--- a/pkg/nodes/consensus_test.go
+++ b/pkg/nodes/consensus_test.go
@@ -1,10 +1,9 @@
 package nodes
 
 import (
+	"github.com/celestiaorg/torch/config"
 	"reflect"
 	"testing"
-
-	"github.com/celestiaorg/torch/config"
 )
 
 func TestSetConsNodeDefault(t *testing.T) {
diff --git a/pkg/nodes/da.go b/pkg/nodes/da.go
index c87c6c5..9f5c8cc 100644
--- a/pkg/nodes/da.go
+++ b/pkg/nodes/da.go
@@ -84,7 +84,7 @@ func SetupDANodeWithConnections(peer config.Peer) error {
 
 		// validate the MA, must start with /ip4/ || /dns/
 		if !strings.HasPrefix(ma, "/ip4/") && !strings.HasPrefix(ma, "/dns/") {
-			errorMessage := fmt.Sprintf("Error generating the MultiAddress, must begin with /ip4/ || /dns/: [%nodeName]", ma)
+			errorMessage := fmt.Sprintf("Error generating the MultiAddress, must begin with /ip4/ || /dns/: [%s]", ma)
 			log.Error(errorMessage)
 			return errors.New(errorMessage)
 		}