From 7cdf560173dee6773b80d1c574a06489d4c394fe Mon Sep 17 00:00:00 2001 From: "M. J. Fromberger" Date: Mon, 27 Dec 2021 16:50:47 -0800 Subject: [PATCH] config: add a Deprecation annotation to P2PConfig.Seeds. (#7496) --- cmd/tendermint/commands/run_node.go | 2 +- config/config.go | 8 +++++--- test/e2e/runner/setup.go | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cmd/tendermint/commands/run_node.go b/cmd/tendermint/commands/run_node.go index feffbc2d0..9b3a2c7b7 100644 --- a/cmd/tendermint/commands/run_node.go +++ b/cmd/tendermint/commands/run_node.go @@ -62,7 +62,7 @@ func AddNodeFlags(cmd *cobra.Command) { "p2p.laddr", config.P2P.ListenAddress, "node listen address. (0.0.0.0:0 means any interface, any port)") - cmd.Flags().String("p2p.seeds", config.P2P.Seeds, "comma-delimited ID@host:port seed nodes") + cmd.Flags().String("p2p.seeds", config.P2P.Seeds, "comma-delimited ID@host:port seed nodes") //nolint: staticcheck cmd.Flags().String("p2p.persistent-peers", config.P2P.PersistentPeers, "comma-delimited ID@host:port persistent peers") cmd.Flags().Bool("p2p.upnp", config.P2P.UPNP, "enable/disable UPNP port forwarding") cmd.Flags().Bool("p2p.pex", config.P2P.PexReactor, "enable/disable Peer-Exchange") diff --git a/config/config.go b/config/config.go index 3ee62ed88..357a6c7d8 100644 --- a/config/config.go +++ b/config/config.go @@ -571,9 +571,11 @@ type P2PConfig struct { //nolint: maligned // Comma separated list of seed nodes to connect to // We only use these if we can’t connect to peers in the addrbook - // NOTE: not used by the new PEX reactor. Please use BootstrapPeers instead. - // TODO: Remove once p2p refactor is complete - // ref: https://github.com/tendermint/tendermint/issues/5670 + // + // Deprecated: This value is not used by the new PEX reactor. Use + // BootstrapPeers instead. + // + // TODO(#5670): Remove once the p2p refactor is complete. Seeds string `mapstructure:"seeds"` // Comma separated list of peers to be added to the peer store diff --git a/test/e2e/runner/setup.go b/test/e2e/runner/setup.go index 8db0a19f7..f9e08579e 100644 --- a/test/e2e/runner/setup.go +++ b/test/e2e/runner/setup.go @@ -316,12 +316,12 @@ func MakeConfig(node *e2e.Node) (*config.Config, error) { } } - cfg.P2P.Seeds = "" + cfg.P2P.Seeds = "" //nolint: staticcheck for _, seed := range node.Seeds { - if len(cfg.P2P.Seeds) > 0 { - cfg.P2P.Seeds += "," + if len(cfg.P2P.Seeds) > 0 { //nolint: staticcheck + cfg.P2P.Seeds += "," //nolint: staticcheck } - cfg.P2P.Seeds += seed.AddressP2P(true) + cfg.P2P.Seeds += seed.AddressP2P(true) //nolint: staticcheck } cfg.P2P.PersistentPeers = ""