Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix default cases #2217

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Fix default cases #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5342d7a
Fix default cases
Djadih Oct 10, 2024
e449287
Update version file (improperly) to comply with action for now
Djadih Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.34.0
v0.34.1-pre
5 changes: 1 addition & 4 deletions cmd/go-quai/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 3 additions & 6 deletions cmd/utils/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}

Expand Down
33 changes: 8 additions & 25 deletions cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading