aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2019-07-10 01:30:24 +0800
committerPéter Szilágyi <peterke@gmail.com>2019-07-10 01:34:42 +0800
commit213690cdfd8e49940b68210da05e3836005b96b8 (patch)
tree08225fc3870740c2b12a1802d9d6f55df10fee68 /cmd/geth
parent8c249cb82f713c5c5b5a8160c92da7fe145e799d (diff)
downloadgo-tangerine-213690cdfd8e49940b68210da05e3836005b96b8.tar
go-tangerine-213690cdfd8e49940b68210da05e3836005b96b8.tar.gz
go-tangerine-213690cdfd8e49940b68210da05e3836005b96b8.tar.bz2
go-tangerine-213690cdfd8e49940b68210da05e3836005b96b8.tar.lz
go-tangerine-213690cdfd8e49940b68210da05e3836005b96b8.tar.xz
go-tangerine-213690cdfd8e49940b68210da05e3836005b96b8.tar.zst
go-tangerine-213690cdfd8e49940b68210da05e3836005b96b8.zip
cmd, eth, les: fix up ultra light config integration
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/config.go2
-rw-r--r--cmd/geth/main.go7
-rw-r--r--cmd/geth/usage.go3
3 files changed, 6 insertions, 6 deletions
diff --git a/cmd/geth/config.go b/cmd/geth/config.go
index ef26f250e..0a63a0277 100644
--- a/cmd/geth/config.go
+++ b/cmd/geth/config.go
@@ -123,7 +123,6 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
}
// Apply flags.
- utils.SetULC(ctx, &cfg.Eth)
utils.SetNodeConfig(ctx, &cfg.Node)
stack, err := node.New(&cfg.Node)
if err != nil {
@@ -133,7 +132,6 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
if ctx.GlobalIsSet(utils.EthStatsURLFlag.Name) {
cfg.Ethstats.URL = ctx.GlobalString(utils.EthStatsURLFlag.Name)
}
-
utils.SetShhConfig(ctx, stack, &cfg.Shh)
utils.SetDashboardConfig(ctx, &cfg.Dashboard)
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index fd8f29421..4d0dc14da 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -90,10 +90,6 @@ var (
utils.TxPoolAccountQueueFlag,
utils.TxPoolGlobalQueueFlag,
utils.TxPoolLifetimeFlag,
- utils.ULCModeConfigFlag,
- utils.OnlyAnnounceModeFlag,
- utils.ULCTrustedNodesFlag,
- utils.ULCMinTrustedFractionFlag,
utils.SyncModeFlag,
utils.ExitWhenSyncedFlag,
utils.GCModeFlag,
@@ -102,6 +98,9 @@ var (
utils.LightBandwidthOutFlag,
utils.LightPeersFlag,
utils.LightKDFFlag,
+ utils.UltraLightServersFlag,
+ utils.UltraLightFractionFlag,
+ utils.UltraLightOnlyAnnounceFlag,
utils.WhitelistFlag,
utils.CacheFlag,
utils.CacheDatabaseFlag,
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index 58a3b87a4..08bd76778 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -86,6 +86,9 @@ var AppHelpFlagGroups = []flagGroup{
utils.LightBandwidthInFlag,
utils.LightBandwidthOutFlag,
utils.LightPeersFlag,
+ utils.UltraLightServersFlag,
+ utils.UltraLightFractionFlag,
+ utils.UltraLightOnlyAnnounceFlag,
utils.LightKDFFlag,
utils.WhitelistFlag,
},