Fix default cases

dominant-strategies · Oct 10, 2024 · c991d2d · c991d2d
1 parent c486917
commit c991d2d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 35 deletions.
diff --git a/cmd/go-quai/start.go b/cmd/go-quai/start.go
@@ -81,10 +81,7 @@ func runStart(cmd *cobra.Command, args []string) error {
 
 	logLevel := viper.GetString(utils.NodeLogLevelFlag.Name)
 
-	var startingExpansionNumber uint64
-	if viper.IsSet(utils.StartingExpansionNumberFlag.Name) {
-		startingExpansionNumber = viper.GetUint64(utils.StartingExpansionNumberFlag.Name)
-	}
+	startingExpansionNumber := viper.GetUint64(utils.StartingExpansionNumberFlag.Name)
 	// Start the  hierarchical co-ordinator
 	var nodeWg sync.WaitGroup
 	hc := utils.NewHierarchicalCoordinator(node, logLevel, &nodeWg, startingExpansionNumber)

diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
@@ -100,10 +100,7 @@ func makeConfigNode(slicesRunning []common.Location, nodeLocation common.Locatio
 	}
 	SetQuaiConfig(stack, &cfg.Quai, slicesRunning, nodeLocation, currentExpansionNumber, logger)
 
-	// TODO: Apply stats
-	if viper.IsSet(QuaiStatsURLFlag.Name) {
-		cfg.Quaistats.URL = viper.GetString(QuaiStatsURLFlag.Name)
-	}
+	cfg.Quaistats.URL = viper.GetString(QuaiStatsURLFlag.Name)
 
 	return stack, cfg
 }
@@ -112,8 +109,8 @@ func defaultNodeConfig() node.Config {
 	cfg := node.DefaultConfig
 	cfg.Name = ""
 	cfg.Version = params.VersionWithCommit("", "")
-	cfg.HTTPModules = append(cfg.HTTPModules, "eth")
-	cfg.WSModules = append(cfg.WSModules, "eth")
+	cfg.HTTPModules = append(cfg.HTTPModules, "quai")
+	cfg.WSModules = append(cfg.WSModules, "quai")
 	return cfg
 }
 

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -845,29 +845,18 @@ func SplitAndTrim(input string) (ret []string) {
 // command line flags, returning empty if the HTTP endpoint is disabled.
 func setHTTP(cfg *node.Config, nodeLocation common.Location) {
 	if viper.GetBool(HTTPEnabledFlag.Name) && cfg.HTTPHost == "" {
-		cfg.HTTPHost = "127.0.0.1"
-		if viper.IsSet(HTTPListenAddrFlag.Name) {
-			cfg.HTTPHost = viper.GetString(HTTPListenAddrFlag.Name)
-		}
+		cfg.HTTPHost = viper.GetString(HTTPListenAddrFlag.Name)
 	}
 
 	cfg.HTTPPort = GetHttpPort(nodeLocation)
 
-	if viper.IsSet(HTTPCORSDomainFlag.Name) {
-		cfg.HTTPCors = SplitAndTrim(viper.GetString(HTTPCORSDomainFlag.Name))
-	}
+	cfg.HTTPCors = SplitAndTrim(viper.GetString(HTTPCORSDomainFlag.Name))
 
-	if viper.IsSet(HTTPApiFlag.Name) {
-		cfg.HTTPModules = SplitAndTrim(viper.GetString(HTTPApiFlag.Name))
-	}
+	cfg.HTTPModules = SplitAndTrim(viper.GetString(HTTPApiFlag.Name))
 
-	if viper.IsSet(HTTPVirtualHostsFlag.Name) {
-		cfg.HTTPVirtualHosts = SplitAndTrim(viper.GetString(HTTPVirtualHostsFlag.Name))
-	}
+	cfg.HTTPVirtualHosts = SplitAndTrim(viper.GetString(HTTPVirtualHostsFlag.Name))
 
-	if viper.IsSet(HTTPPathPrefixFlag.Name) {
-		cfg.HTTPPathPrefix = viper.GetString(HTTPPathPrefixFlag.Name)
-	}
+	cfg.HTTPPathPrefix = viper.GetString(HTTPPathPrefixFlag.Name)
 }
 
 func GetHttpPort(nodeLocation common.Location) int {
@@ -900,17 +889,11 @@ func setWS(cfg *node.Config, nodeLocation common.Location) {
 
 	cfg.WSPort = GetWSPort(nodeLocation)
 
-	if viper.IsSet(WSAllowedOriginsFlag.Name) {
-		cfg.WSOrigins = SplitAndTrim(viper.GetString(WSAllowedOriginsFlag.Name))
-	}
+	cfg.WSOrigins = SplitAndTrim(viper.GetString(WSAllowedOriginsFlag.Name))
 
-	if viper.IsSet(WSApiFlag.Name) {
-		cfg.WSModules = SplitAndTrim(viper.GetString(WSApiFlag.Name))
-	}
+	cfg.WSModules = SplitAndTrim(viper.GetString(WSApiFlag.Name))
 
-	if viper.IsSet(WSPathPrefixFlag.Name) {
-		cfg.WSPathPrefix = viper.GetString(WSPathPrefixFlag.Name)
-	}
+	cfg.WSPathPrefix = viper.GetString(WSPathPrefixFlag.Name)
 }
 
 func GetWSPort(nodeLocation common.Location) int {