feat: refactor node config

cartesi · Mar 4, 2024 · b915689 · b915689
1 parent c3d3969
commit b915689
Show file tree

Hide file tree

Showing 14 changed files with 671 additions and 342 deletions.
diff --git a/cmd/cartesi-rollups-node/handlers.go b/cmd/cartesi-rollups-node/handlers.go
@@ -17,37 +17,37 @@ func newHttpServiceHandler(nodeConfig config.NodeConfig) http.Handler {
 	handler.Handle("/healthz", http.HandlerFunc(healthcheckHandler))
 
 	graphqlProxy, err := newReverseProxy(
-		nodeConfig.CartesiHttpAddress,
-		getPort(nodeConfig.CartesiHttpPort, portOffsetGraphQLServer),
+		nodeConfig.CartesiHttpAddress(),
+		getPort(nodeConfig.CartesiHttpPort(), portOffsetGraphQLServer),
 	)
 	if err != nil {
 		config.ErrorLogger.Fatal(err)
 	}
 	handler.Handle("/graphql", graphqlProxy)
 
 	dispatcherProxy, err := newReverseProxy(
-		nodeConfig.CartesiHttpAddress,
-		getPort(nodeConfig.CartesiHttpPort, portOffsetDispatcher),
+		nodeConfig.CartesiHttpAddress(),
+		getPort(nodeConfig.CartesiHttpPort(), portOffsetDispatcher),
 	)
 	if err != nil {
 		config.ErrorLogger.Fatal(err)
 	}
 	handler.Handle("/metrics", dispatcherProxy)
 
 	inspectProxy, err := newReverseProxy(
-		nodeConfig.CartesiHttpAddress,
-		getPort(nodeConfig.CartesiHttpPort, portOffsetInspectServer),
+		nodeConfig.CartesiHttpAddress(),
+		getPort(nodeConfig.CartesiHttpPort(), portOffsetInspectServer),
 	)
 	if err != nil {
 		config.ErrorLogger.Fatal(err)
 	}
 	handler.Handle("/inspect", inspectProxy)
 	handler.Handle("/inspect/", inspectProxy)
 
-	if nodeConfig.CartesiFeatureHostMode {
+	if nodeConfig.CartesiFeatureHostMode() {
 		hostProxy, err := newReverseProxy(
-			nodeConfig.CartesiHttpAddress,
-			getPort(nodeConfig.CartesiHttpPort, portOffsetHostRunnerRollups),
+			nodeConfig.CartesiHttpAddress(),
+			getPort(nodeConfig.CartesiHttpPort(), portOffsetHostRunnerRollups),
 		)
 		if err != nil {
 			config.ErrorLogger.Fatal(err)

diff --git a/cmd/cartesi-rollups-node/main.go b/cmd/cartesi-rollups-node/main.go
@@ -22,7 +22,9 @@ func main() {
 
 	nodeConfig := config.NewNodeConfigFromEnv()
 
-	sunodoValidatorEnabled := nodeConfig.CartesiExperimentalSunodoValidatorEnabled
+	nodeConfig.Validate()
+
+	sunodoValidatorEnabled := nodeConfig.CartesiExperimentalSunodoValidatorEnabled()
 	if !sunodoValidatorEnabled {
 		// add Redis first
 		s = append(s, newRedis(nodeConfig))
@@ -34,14 +36,14 @@ func main() {
 	s = append(s, newStateServer(nodeConfig))
 
 	// start either the server manager or host runner
-	if nodeConfig.CartesiFeatureHostMode {
+	if nodeConfig.CartesiFeatureHostMode() {
 		s = append(s, newHostRunner(nodeConfig))
 	} else {
 		s = append(s, newServerManager(nodeConfig))
 	}
 
 	// enable claimer if reader mode and sunodo validator mode are disabled
-	if !nodeConfig.CartesiFeatureDisableClaimer && !sunodoValidatorEnabled {
+	if !nodeConfig.CartesiFeatureDisableClaimer() && !sunodoValidatorEnabled {
 		s = append(s, newAuthorityClaimer(nodeConfig))
 	}