From 4d139f83d769add40838b9de225778e1c707bafd Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 28 Jul 2023 13:52:15 +0000
Subject: [PATCH] refactor: remove `iavl-lazy-loading` from config (backport
 #17177) (#17178)

Co-authored-by: Julien Robert <julien@rbrt.fr>
---
 CHANGELOG.md                     | 1 +
 UPGRADING.md                     | 4 ++--
 server/config/config.go          | 4 ----
 server/config/toml.go            | 4 ----
 server/mock/store.go             | 4 ----
 tools/confix/data/v0.50-app.toml | 4 ----
 6 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e42d4a9b2..ca732d6788 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### CLI Breaking Changes
 
+* (server) [#17177](https://github.com/cosmos/cosmos-sdk/pull/17177) Remove `iavl-lazy-loading` configuration.
 * (rosetta) [#16276](https://github.com/cosmos/cosmos-sdk/issues/16276) Rosetta migration to standalone repo.
 
 ## [v0.50.0-beta.0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.0-beta.0) - 2023-07-19
diff --git a/UPGRADING.md b/UPGRADING.md
index cc071ecf6e..09a535eb6e 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -18,13 +18,13 @@ Following an exhaustive list:
 * Package `client/grpc/tmservice` -> `client/grpc/cmtservice`
 
 Additionally, the commands and flags mentioning `tendermint` have been renamed to `comet`.
-However, these commands and flags is still supported for backward compatibility.
+However, these commands and flags are still supported for backward compatibility.
 
 For backward compatibility, the `**/tendermint/**` gRPC services are still supported.
 
 Additionally, the SDK is starting its abstraction from CometBFT Go types thorought the codebase:
 
-* The usage of CometBFT have been replaced to use the Cosmos SDK logger interface (`cosmossdk.io/log.Logger`).
+* The usage of the CometBFT logger has been replaced by the Cosmos SDK logger interface (`cosmossdk.io/log.Logger`).
 * The usage of `github.com/cometbft/cometbft/libs/bytes.HexByte` have been replaced by `[]byte`.
 
 #### Enable Vote Extensions
diff --git a/server/config/config.go b/server/config/config.go
index 5cf1313b66..44b67a9e4c 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -85,9 +85,6 @@ type BaseConfig struct {
 	// IAVLDisableFastNode enables or disables the fast sync node.
 	IAVLDisableFastNode bool `mapstructure:"iavl-disable-fastnode"`
 
-	// IAVLLazyLoading enable/disable the lazy loading of iavl store.
-	IAVLLazyLoading bool `mapstructure:"iavl-lazy-loading"`
-
 	// AppDBBackend defines the type of Database to use for the application and snapshots databases.
 	// An empty string indicates that the CometBFT config's DBBackend value should be used.
 	AppDBBackend string `mapstructure:"app-db-backend"`
@@ -236,7 +233,6 @@ func DefaultConfig() *Config {
 			IndexEvents:         make([]string, 0),
 			IAVLCacheSize:       781250,
 			IAVLDisableFastNode: false,
-			IAVLLazyLoading:     false,
 			AppDBBackend:        "",
 		},
 		Telemetry: telemetry.Config{
diff --git a/server/config/toml.go b/server/config/toml.go
index de846d8f85..877913fcf2 100644
--- a/server/config/toml.go
+++ b/server/config/toml.go
@@ -77,10 +77,6 @@ iavl-cache-size = {{ .BaseConfig.IAVLCacheSize }}
 # Default is false.
 iavl-disable-fastnode = {{ .BaseConfig.IAVLDisableFastNode }}
 
-# IAVLLazyLoading enable/disable the lazy loading of iavl store.
-# Default is false.
-iavl-lazy-loading = {{ .BaseConfig.IAVLLazyLoading }}
-
 # AppDBBackend defines the database backend type to use for the application and snapshots DBs.
 # An empty string indicates that a fallback will be used.
 # First fallback is the deprecated compile-time types.DBBackend value.
diff --git a/server/mock/store.go b/server/mock/store.go
index 2094e2905d..6e8a303646 100644
--- a/server/mock/store.go
+++ b/server/mock/store.go
@@ -142,10 +142,6 @@ func (ms multiStore) SetIAVLDisableFastNode(disable bool) {
 	panic("not implemented")
 }
 
-func (ms multiStore) SetLazyLoading(bool) {
-	panic("not implemented")
-}
-
 func (ms multiStore) SetInitialVersion(version int64) error {
 	panic("not implemented")
 }
diff --git a/tools/confix/data/v0.50-app.toml b/tools/confix/data/v0.50-app.toml
index 4b997ab00c..f4596897a8 100644
--- a/tools/confix/data/v0.50-app.toml
+++ b/tools/confix/data/v0.50-app.toml
@@ -66,10 +66,6 @@ iavl-cache-size = 781250
 # Default is false.
 iavl-disable-fastnode = false
 
-# IAVLLazyLoading enable/disable the lazy loading of iavl store.
-# Default is false.
-iavl-lazy-loading = false
-
 # AppDBBackend defines the database backend type to use for the application and snapshots DBs.
 # An empty string indicates that a fallback will be used.
 # First fallback is the deprecated compile-time types.DBBackend value.