Skip to content

Commit 57e985e

Browse files
authored
cmd/utils: remove deprecated LES flags (#31838)
They were not widely used in users setups.
1 parent 1f17534 commit 57e985e

File tree

3 files changed

+0
-66
lines changed

3 files changed

+0
-66
lines changed

cmd/geth/main.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,7 @@ var (
9191
utils.LogNoHistoryFlag,
9292
utils.LogExportCheckpointsFlag,
9393
utils.StateHistoryFlag,
94-
utils.LightServeFlag, // deprecated
95-
utils.LightIngressFlag, // deprecated
96-
utils.LightEgressFlag, // deprecated
97-
utils.LightMaxPeersFlag, // deprecated
98-
utils.LightNoPruneFlag, // deprecated
9994
utils.LightKDFFlag,
100-
utils.LightNoSyncServeFlag, // deprecated
10195
utils.EthRequiredBlocksFlag,
10296
utils.LegacyWhitelistFlag, // deprecated
10397
utils.CacheFlag,

cmd/utils/flags.go

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,28 +1245,6 @@ func setIPC(ctx *cli.Context, cfg *node.Config) {
12451245
}
12461246
}
12471247

1248-
// setLes shows the deprecation warnings for LES flags.
1249-
func setLes(ctx *cli.Context, cfg *ethconfig.Config) {
1250-
if ctx.IsSet(LightServeFlag.Name) {
1251-
log.Warn("The light server has been deprecated, please remove this flag", "flag", LightServeFlag.Name)
1252-
}
1253-
if ctx.IsSet(LightIngressFlag.Name) {
1254-
log.Warn("The light server has been deprecated, please remove this flag", "flag", LightIngressFlag.Name)
1255-
}
1256-
if ctx.IsSet(LightEgressFlag.Name) {
1257-
log.Warn("The light server has been deprecated, please remove this flag", "flag", LightEgressFlag.Name)
1258-
}
1259-
if ctx.IsSet(LightMaxPeersFlag.Name) {
1260-
log.Warn("The light server has been deprecated, please remove this flag", "flag", LightMaxPeersFlag.Name)
1261-
}
1262-
if ctx.IsSet(LightNoPruneFlag.Name) {
1263-
log.Warn("The light server has been deprecated, please remove this flag", "flag", LightNoPruneFlag.Name)
1264-
}
1265-
if ctx.IsSet(LightNoSyncServeFlag.Name) {
1266-
log.Warn("The light server has been deprecated, please remove this flag", "flag", LightNoSyncServeFlag.Name)
1267-
}
1268-
}
1269-
12701248
// MakeDatabaseHandles raises out the number of allowed file handles per process
12711249
// for Geth and returns half of the allowance to assign to the database.
12721250
func MakeDatabaseHandles(max int) int {
@@ -1582,7 +1560,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
15821560
setBlobPool(ctx, &cfg.BlobPool)
15831561
setMiner(ctx, &cfg.Miner)
15841562
setRequiredBlocks(ctx, cfg)
1585-
setLes(ctx, cfg)
15861563

15871564
// Cap the cache allowance and tune the garbage collector
15881565
mem, err := gopsutil.VirtualMemory()

cmd/utils/flags_legacy.go

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ var DeprecatedFlags = []cli.Flag{
3939
CacheTrieRejournalFlag,
4040
LegacyDiscoveryV5Flag,
4141
TxLookupLimitFlag,
42-
LightServeFlag,
43-
LightIngressFlag,
44-
LightEgressFlag,
45-
LightMaxPeersFlag,
46-
LightNoPruneFlag,
47-
LightNoSyncServeFlag,
4842
LogBacktraceAtFlag,
4943
LogDebugFlag,
5044
MinerNewPayloadTimeoutFlag,
@@ -88,37 +82,6 @@ var (
8882
Value: ethconfig.Defaults.TransactionHistory,
8983
Category: flags.DeprecatedCategory,
9084
}
91-
// Light server and client settings, Deprecated November 2023
92-
LightServeFlag = &cli.IntFlag{
93-
Name: "light.serve",
94-
Usage: "Maximum percentage of time allowed for serving LES requests (deprecated)",
95-
Category: flags.DeprecatedCategory,
96-
}
97-
LightIngressFlag = &cli.IntFlag{
98-
Name: "light.ingress",
99-
Usage: "Incoming bandwidth limit for serving light clients (deprecated)",
100-
Category: flags.DeprecatedCategory,
101-
}
102-
LightEgressFlag = &cli.IntFlag{
103-
Name: "light.egress",
104-
Usage: "Outgoing bandwidth limit for serving light clients (deprecated)",
105-
Category: flags.DeprecatedCategory,
106-
}
107-
LightMaxPeersFlag = &cli.IntFlag{
108-
Name: "light.maxpeers",
109-
Usage: "Maximum number of light clients to serve, or light servers to attach to (deprecated)",
110-
Category: flags.DeprecatedCategory,
111-
}
112-
LightNoPruneFlag = &cli.BoolFlag{
113-
Name: "light.nopruning",
114-
Usage: "Disable ancient light chain data pruning (deprecated)",
115-
Category: flags.DeprecatedCategory,
116-
}
117-
LightNoSyncServeFlag = &cli.BoolFlag{
118-
Name: "light.nosyncserve",
119-
Usage: "Enables serving light clients before syncing (deprecated)",
120-
Category: flags.DeprecatedCategory,
121-
}
12285
// Deprecated November 2023
12386
LogBacktraceAtFlag = &cli.StringFlag{
12487
Name: "log.backtrace",

0 commit comments

Comments
 (0)