diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-06-30 18:06:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-30 18:06:52 +0800 |
| commit | a0aa071ca6f6bfd77fb57273ef5477d3aa2ac6c0 (patch) | |
| tree | b30345bbd8dcfcc38589abf1a17ad24c120873a9 /cmd/swarm | |
| parent | 41318f3776f3ecc09c2f482070bddc7433e00b14 (diff) | |
| parent | c7041fe1455541e59879df2b2d36984d49d1630b (diff) | |
| download | go-tangerine-a0aa071ca6f6bfd77fb57273ef5477d3aa2ac6c0.tar.gz go-tangerine-a0aa071ca6f6bfd77fb57273ef5477d3aa2ac6c0.tar.zst go-tangerine-a0aa071ca6f6bfd77fb57273ef5477d3aa2ac6c0.zip | |
Merge pull request #14732 from ethersphere/swarm-remove-ethapi
cmd/swarm: Exit if --ethapi is set
Diffstat (limited to 'cmd/swarm')
| -rw-r--r-- | cmd/swarm/main.go | 27 | ||||
| -rw-r--r-- | cmd/swarm/run_test.go | 2 |
2 files changed, 14 insertions, 15 deletions
diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index f0680c487..6b4feb0bc 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -100,10 +100,6 @@ var ( Name: "sync", Usage: "Swarm Syncing enabled (default true)", } - EthAPIFlag = cli.StringFlag{ - Name: "ethapi", - Usage: "DEPRECATED: please use --ens-api and --swap-api", - } EnsAPIFlag = cli.StringFlag{ Name: "ens-api", Usage: "URL of the Ethereum API provider to use for ENS record lookups", @@ -142,6 +138,12 @@ var ( Name: "corsdomain", Usage: "Domain on which to send Access-Control-Allow-Origin header (multiple domains can be supplied separated by a ',')", } + + // the following flags are deprecated and should be removed in the future + DeprecatedEthAPIFlag = cli.StringFlag{ + Name: "ethapi", + Usage: "DEPRECATED: please use --ens-api and --swap-api", + } ) var defaultNodeConfig = node.DefaultConfig @@ -266,7 +268,6 @@ Cleans database of corrupted entries. utils.PasswordFileFlag, // bzzd-specific flags CorsStringFlag, - EthAPIFlag, EnsAPIFlag, EnsAddrFlag, SwarmConfigPathFlag, @@ -285,6 +286,8 @@ Cleans database of corrupted entries. SwarmUploadDefaultPath, SwarmUpFromStdinFlag, SwarmUploadMimeType, + //deprecated flags + DeprecatedEthAPIFlag, } app.Flags = append(app.Flags, debug.Flags...) app.Before = func(ctx *cli.Context) error { @@ -319,6 +322,11 @@ func version(ctx *cli.Context) error { } func bzzd(ctx *cli.Context) error { + // exit if the deprecated --ethapi flag is set + if ctx.GlobalString(DeprecatedEthAPIFlag.Name) != "" { + utils.Fatalf("--ethapi is no longer a valid command line flag, please use --ens-api and/or --swap-api.") + } + cfg := defaultNodeConfig utils.SetNodeConfig(ctx, &cfg) stack, err := node.New(&cfg) @@ -408,21 +416,12 @@ func registerBzzService(ctx *cli.Context, stack *node.Node) { swapEnabled := ctx.GlobalBool(SwarmSwapEnabledFlag.Name) syncEnabled := ctx.GlobalBoolT(SwarmSyncEnabledFlag.Name) - ethapi := ctx.GlobalString(EthAPIFlag.Name) - if ethapi != "" { - log.Warn("DEPRECATED: --ethapi is deprecated and will be removed in a future version, please use --ens-api and --swap-api") - } - swapapi := ctx.GlobalString(SwarmSwapAPIFlag.Name) if swapEnabled && swapapi == "" { utils.Fatalf("SWAP is enabled but --swap-api is not set") } ensapi := ctx.GlobalString(EnsAPIFlag.Name) - // use the deprecated --ethapi if --ens-api is not set - if ensapi == "" { - ensapi = ethapi - } ensAddr := ctx.GlobalString(EnsAddrFlag.Name) cors := ctx.GlobalString(CorsStringFlag.Name) diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index 2d32a51c8..05cbb27f1 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -194,7 +194,7 @@ func newTestNode(t *testing.T, dir string) *testNode { "--nodiscover", "--datadir", dir, "--ipcpath", conf.IPCPath, - "--ethapi", "", + "--ens-api", "", "--bzzaccount", account.Address.String(), "--bzznetworkid", "321", "--bzzport", httpPort, |