From 9587d030a69e564a68eed78e707a97ec857f236a Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Wed, 8 Aug 2018 09:53:20 +0200 Subject: [PATCH] mailserver-canary: Disable fleet specification --- cmd/mailserver-canary/main.go | 2 +- params/cluster.go | 5 +++-- params/config.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/mailserver-canary/main.go b/cmd/mailserver-canary/main.go index c8d023adf..d259a3744 100644 --- a/cmd/mailserver-canary/main.go +++ b/cmd/mailserver-canary/main.go @@ -192,7 +192,7 @@ func makeNodeConfig() (*params.NodeConfig, error) { return nil, err } - nodeConfig, err := params.NewNodeConfig(path.Join(workDir, ".ethereum"), "", params.FleetBeta, uint64(params.RopstenNetworkID)) + nodeConfig, err := params.NewNodeConfig(path.Join(workDir, ".ethereum"), "", params.FleetUndefined, uint64(params.RopstenNetworkID)) if err != nil { return nil, err } diff --git a/params/cluster.go b/params/cluster.go index 0a815a8da..92d233c73 100644 --- a/params/cluster.go +++ b/params/cluster.go @@ -4,8 +4,9 @@ import "errors" // Define available fleets. const ( - FleetBeta = "eth.beta" - FleetStaging = "eth.staging" + FleetUndefined = "" + FleetBeta = "eth.beta" + FleetStaging = "eth.staging" ) type cluster struct { diff --git a/params/config.go b/params/config.go index b38dedaa8..39bf7c06a 100644 --- a/params/config.go +++ b/params/config.go @@ -376,7 +376,7 @@ func NewNodeConfig(dataDir, clstrCfgFile, fleet string, networkID uint64) (*Node LogToStderr: LogToStderr, ClusterConfigFile: clstrCfgFile, ClusterConfig: &ClusterConfig{ - Enabled: true, + Enabled: fleet != FleetUndefined, Fleet: fleet, StaticNodes: []string{}, BootNodes: []string{},