From f24af04f7accff9d92eab7880d80351688765f0f Mon Sep 17 00:00:00 2001 From: Chase Wright Date: Wed, 15 Nov 2017 09:20:32 -0600 Subject: [PATCH] Fix LightServ --- cmd/utils/flags.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index bfef619f6c..f6d81358fc 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -926,6 +926,8 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) { // Avoid conflicting network flags checkExclusive(ctx, DevModeFlag, TestnetFlag, RinkebyFlag) checkExclusive(ctx, FastSyncFlag, LightModeFlag, SyncModeFlag) + checkExclusive(ctx, LightModeFlag, LightServFlag) + checkExclusive(ctx, LightModeFlag, LightPeersFlag) ks := stack.AccountManager().Backends(keystore.KeyStoreType)[0].(*keystore.KeyStore) setEtherbase(ctx, ks, cfg) @@ -941,10 +943,11 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) { case ctx.GlobalBool(LightModeFlag.Name): cfg.SyncMode = downloader.LightSync } - if ctx.GlobalIsSet(LightServFlag.Name) { + + if ctx.GlobalIsSet(LightServFlag.Name) && cfg.SyncMode != downloader.LightSync { cfg.LightServ = ctx.GlobalInt(LightServFlag.Name) } - if ctx.GlobalIsSet(LightPeersFlag.Name) { + if ctx.GlobalIsSet(LightPeersFlag.Name) && cfg.SyncMode != downloader.LightSync { cfg.LightPeers = ctx.GlobalInt(LightPeersFlag.Name) } if ctx.GlobalIsSet(NetworkIdFlag.Name) {