diff --git a/config/config.go b/config/config.go index 3eea2b7b5..c60d37d13 100644 --- a/config/config.go +++ b/config/config.go @@ -68,18 +68,15 @@ type Config struct { BaseConfig `mapstructure:",squash"` // Options for services - RPC *RPCConfig `mapstructure:"rpc"` - P2P *P2PConfig `mapstructure:"p2p"` - Mempool *MempoolConfig `mapstructure:"mempool"` - StateSync *StateSyncConfig `mapstructure:"statesync"` - BlockSync *BlockSyncConfig `mapstructure:"blocksync"` - //TODO(williambanfield): remove this field once v0.37 is released. - // https://github.com/tendermint/tendermint/issues/9279 - DeprecatedFastSyncConfig map[interface{}]interface{} `mapstructure:"fastsync"` - Consensus *ConsensusConfig `mapstructure:"consensus"` - Storage *StorageConfig `mapstructure:"storage"` - TxIndex *TxIndexConfig `mapstructure:"tx_index"` - Instrumentation *InstrumentationConfig `mapstructure:"instrumentation"` + RPC *RPCConfig `mapstructure:"rpc"` + P2P *P2PConfig `mapstructure:"p2p"` + Mempool *MempoolConfig `mapstructure:"mempool"` + StateSync *StateSyncConfig `mapstructure:"statesync"` + BlockSync *BlockSyncConfig `mapstructure:"blocksync"` + Consensus *ConsensusConfig `mapstructure:"consensus"` + Storage *StorageConfig `mapstructure:"storage"` + TxIndex *TxIndexConfig `mapstructure:"tx_index"` + Instrumentation *InstrumentationConfig `mapstructure:"instrumentation"` } // DefaultConfig returns a default configuration for a Tendermint node @@ -154,14 +151,9 @@ func (cfg *Config) ValidateBasic() error { return nil } +// CheckDeprecated returns any deprecation warnings. These are printed to the operator on startup func (cfg *Config) CheckDeprecated() []string { var warnings []string - if cfg.DeprecatedFastSyncConfig != nil { - warnings = append(warnings, "[fastsync] table detected. This section has been renamed to [blocksync]. The values in this deprecated section will be disregarded.") - } - if cfg.BaseConfig.DeprecatedFastSyncMode != nil { - warnings = append(warnings, "fast_sync key detected. This key has been renamed to block_sync. The value of this deprecated key will be disregarded.") - } return warnings } @@ -189,10 +181,6 @@ type BaseConfig struct { //nolint: maligned // and verifying their commits BlockSyncMode bool `mapstructure:"block_sync"` - //TODO(williambanfield): remove this field once v0.37 is released. - // https://github.com/tendermint/tendermint/issues/9279 - DeprecatedFastSyncMode interface{} `mapstructure:"fast_sync"` - // Database backend: goleveldb | cleveldb | boltdb | rocksdb // * goleveldb (github.com/syndtr/goleveldb - most popular implementation) // - pure go