diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go index 6d261d305562025f6c5c5adb53e2336ca6ac684f..e623de8bb1b6455eae19af5e0c54b8c37affac03 100644 --- a/cmd/swarm/config.go +++ b/cmd/swarm/config.go @@ -179,7 +179,9 @@ func cmdLineOverride(currentConfig *bzzapi.Config, ctx *cli.Context) *bzzapi.Con if err != nil { utils.Fatalf("invalid cli flag %s: %v", SwarmNetworkIdFlag.Name, err) } - currentConfig.NetworkID = id + if id != 0 { + currentConfig.NetworkID = id + } } if ctx.GlobalIsSet(utils.DataDirFlag.Name) { @@ -272,7 +274,9 @@ func envVarsOverride(currentConfig *bzzapi.Config) (config *bzzapi.Config) { if err != nil { utils.Fatalf("invalid environment variable %s: %v", SWARM_ENV_NETWORK_ID, err) } - currentConfig.NetworkID = id + if id != 0 { + currentConfig.NetworkID = id + } } if datadir := os.Getenv(GETH_ENV_DATADIR); datadir != "" { diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 197836699c12c9473988b4e26f634116ce918a7c..4c9ce931eefc07644a3395e365850b96353f5642 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -95,7 +95,6 @@ var ( Name: "bzznetworkid", Usage: "Network identifier (integer, default 3=swarm testnet)", EnvVar: SWARM_ENV_NETWORK_ID, - Value: 3, } SwarmSwapEnabledFlag = cli.BoolFlag{ Name: "swap",