forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Disallow --lightserv in light mode

Browse source
This commit is contained in:
tsarpaul 2017-11-18 02:35:21 +02:00 committed by Péter Szilágyi
parent f0ac925fa7
commit ce45110a8e
No known key found for this signature in database
GPG key ID: E9AE538CEDF8293D
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cmd/utils/flags.go
View file

@ -929,11 +929,27 @@ func setEthash(ctx *cli.Context, cfg *eth.Config) {
} }
} }
func checkExclusive(ctx *cli.Context, flags ...cli.Flag) { func checkExclusive(ctx *cli.Context, args ...interface{}) {
set := make([]string, 0, 1) set := make([]string, 0, 1)
for _, flag := range flags { for i, arg := range args {
if flag, ok := arg.(cli.Flag); ok {
if ctx.GlobalIsSet(flag.GetName()) { if ctx.GlobalIsSet(flag.GetName()) {
set = append(set, "--"+flag.GetName()) // Check if next arg extends current
if len(args) > i+1 {
switch option := args[i+1].(type) {
case cli.Flag:
set = append(set, `"--` + flag.GetName() + `"`)
case string:
if ctx.GlobalString(flag.GetName()) == option {
set = append(set, `"--` + flag.GetName() + ` ` + option + `"`)
}
default:
Fatalf("Received wrong type in checkExclusive")
}
} else {
set = append(set, `"--` + flag.GetName() + `"`)
}
}
} }
} }
if len(set) > 1 { if len(set) > 1 {
@ -956,6 +972,8 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
// Avoid conflicting network flags // Avoid conflicting network flags
checkExclusive(ctx, DeveloperFlag, TestnetFlag, RinkebyFlag) checkExclusive(ctx, DeveloperFlag, TestnetFlag, RinkebyFlag)
checkExclusive(ctx, FastSyncFlag, LightModeFlag, SyncModeFlag) checkExclusive(ctx, FastSyncFlag, LightModeFlag, SyncModeFlag)
checkExclusive(ctx, LightServFlag, LightModeFlag)
checkExclusive(ctx, LightServFlag, SyncModeFlag, "light")
ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore) ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore)
setEtherbase(ctx, ks, cfg) setEtherbase(ctx, ks, cfg)