Skip to content
This repository was archived by the owner on Aug 2, 2021. It is now read-only.

cmd/swarm: correct bzznetworkid flag description #1761

Merged
skylenet merged 4 commits into from
Sep 20, 2019
Merged

cmd/swarm: correct bzznetworkid flag description #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa0bdcb
cmd/swarm: correct bzznetworkid flag description
skylenet Sep 16, 2019
ccf3854
cmd/swarm: dont set networkid from flag if its the default ID
skylenet Sep 17, 2019
5540f81
cmd/swarm: fix error log for DbCapacity failure on test
skylenet Sep 17, 2019
3a7a3db
cmd/swarm: fix conflict
skylenet Sep 20, 2019
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
14 changes: 5 additions & 9 deletions cmd/swarm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"io"
"os"
"reflect"
"strconv"
"strings"
"unicode"

Expand All @@ -36,6 +35,7 @@ import (
"github.com/naoina/toml"

bzzapi "github.com/ethersphere/swarm/api"
"github.com/ethersphere/swarm/network"
)

var (
Expand Down Expand Up @@ -181,14 +181,10 @@ func flagsOverride(currentConfig *bzzapi.Config, ctx *cli.Context) *bzzapi.Confi
if chbookaddr := ctx.GlobalString(SwarmSwapChequebookAddrFlag.Name); chbookaddr != "" {
currentConfig.Contract = common.HexToAddress(chbookaddr)
}
if networkid := ctx.GlobalString(SwarmNetworkIdFlag.Name); networkid != "" {
id, err := strconv.ParseUint(networkid, 10, 64)
if err != nil {
utils.Fatalf("invalid cli flag %s: %v", SwarmNetworkIdFlag.Name, err)
}
if id != 0 {
currentConfig.NetworkID = id
}

networkid := ctx.GlobalUint64(SwarmNetworkIdFlag.Name)
if networkid != 0 && networkid != network.DefaultNetworkID {
currentConfig.NetworkID = networkid
}
if ctx.GlobalIsSet(utils.DataDirFlag.Name) {
if datadir := ctx.GlobalString(utils.DataDirFlag.Name); datadir != "" {
Expand Down
2 changes: 1 addition & 1 deletion cmd/swarm/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ func TestConfigFileOverrides(t *testing.T) {
}

if info.DbCapacity != 9000000 {
t.Fatalf("Expected network ID to be %d, got %d", 54, info.NetworkID)
t.Fatalf("Expected DbCapacity to be %d, got %d", 9000000, info.DbCapacity)
}

if info.HiveParams.KeepAliveInterval != 6000000000 {
Expand Down
8 changes: 6 additions & 2 deletions cmd/swarm/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@
// Command feed allows the user to create and update signed Swarm feeds
package main

import cli "gopkg.in/urfave/cli.v1"
import (
"github.com/ethersphere/swarm/network"
cli "gopkg.in/urfave/cli.v1"
)

var (
SwarmSwapChequebookAddrFlag = cli.StringFlag{
Expand Down Expand Up @@ -52,7 +55,8 @@ var (
}
SwarmNetworkIdFlag = cli.IntFlag{
Name: "bzznetworkid",
Usage: "Network identifier (integer, default 3=swarm testnet)",
Usage: "Numerical network identifier. The default is the public swarm testnet",
Value: network.DefaultNetworkID,
EnvVar: SwarmEnvNetworkID,
}
SwarmSwapEnabledFlag = cli.BoolFlag{
Expand Down