mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-19 21:31:37 +00:00
cmd/geth: print warning when whisper config is present in toml (#21544)
This commit is contained in:
parent
995db1892b
commit
cfb72501bf
1 changed files with 15 additions and 0 deletions
|
|
@ -88,8 +88,19 @@ type Bootnodes struct {
|
|||
Testnet []string
|
||||
}
|
||||
|
||||
// whisper has been deprecated, but clients out there might still have [Shh]
|
||||
// in their config, which will crash. Cut them some slack by keeping the
|
||||
// config, and displaying a message that those config switches are ineffectual.
|
||||
// To be removed circa Q1 2021 -- @gballet.
|
||||
type whisperDeprecatedConfig struct {
|
||||
MaxMessageSize uint32 `toml:",omitempty"`
|
||||
MinimumAcceptedPOW float64 `toml:",omitempty"`
|
||||
RestrictConnectionBetweenLightClients bool `toml:",omitempty"`
|
||||
}
|
||||
|
||||
type XDCConfig struct {
|
||||
Eth ethconfig.Config
|
||||
Shh whisperDeprecatedConfig
|
||||
Node node.Config
|
||||
Ethstats ethstatsConfig
|
||||
XDCX XDCx.Config
|
||||
|
|
@ -139,6 +150,10 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, XDCConfig) {
|
|||
if err := loadConfig(file, &cfg); err != nil {
|
||||
utils.Fatalf("%v", err)
|
||||
}
|
||||
|
||||
if cfg.Shh != (whisperDeprecatedConfig{}) {
|
||||
log.Warn("Deprecated whisper config detected. Whisper has been moved to github.com/ethereum/whisper")
|
||||
}
|
||||
}
|
||||
if ctx.GlobalIsSet(utils.StakingEnabledFlag.Name) {
|
||||
cfg.StakeEnable = ctx.GlobalBool(utils.StakingEnabledFlag.Name)
|
||||
|
|
|
|||
Loading…
Reference in a new issue