From 69898beab95bd64dd2a54e40d7b0c530839d32ab Mon Sep 17 00:00:00 2001 From: dudong2 Date: Thu, 17 Oct 2024 19:53:40 +0900 Subject: [PATCH] Revert "chore: Sync with cronos memiavl store version" This reverts commit eefcddf22502301f7ac651ba9151462349a46ab5. --- store/cachemulti/store.go | 11 ----------- store/rootmulti/store.go | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/store/cachemulti/store.go b/store/cachemulti/store.go index ee1a2ef32757..e4e989745d24 100644 --- a/store/cachemulti/store.go +++ b/store/cachemulti/store.go @@ -4,8 +4,6 @@ import ( "fmt" "io" - dbm "github.com/cosmos/cosmos-db" - "cosmossdk.io/store/tracekv" "cosmossdk.io/store/types" ) @@ -56,15 +54,6 @@ func NewFromKVStore( // NewStore creates a new Store object from a mapping of store keys to // CacheWrapper objects. Each CacheWrapper store is a branched store. func NewStore( - _ dbm.DB, stores map[types.StoreKey]types.CacheWrapper, _ map[string]types.StoreKey, - traceWriter io.Writer, traceContext types.TraceContext, -) Store { - return newStore(stores, traceWriter, traceContext) -} - -// NewStore creates a new Store object from a mapping of store keys to -// CacheWrapper objects. Each CacheWrapper store is a branched store. -func newStore( stores map[types.StoreKey]types.CacheWrapper, traceWriter io.Writer, traceContext types.TraceContext, ) Store { diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index 2e830fb338be..a3f00f342958 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -565,7 +565,7 @@ func (rs *Store) CacheMultiStore() types.CacheMultiStore { } stores[k] = store } - return cachemulti.NewStore(nil, stores, nil, rs.traceWriter, rs.getTracingContext()) + return cachemulti.NewStore(stores, rs.traceWriter, rs.getTracingContext()) } // CacheMultiStoreWithVersion is analogous to CacheMultiStore except that it @@ -627,7 +627,7 @@ func (rs *Store) CacheMultiStoreWithVersion(version int64) (types.CacheMultiStor cachedStores[key] = cacheStore } - return cachemulti.NewStore(nil, cachedStores, nil, rs.traceWriter, rs.getTracingContext()), nil + return cachemulti.NewStore(cachedStores, rs.traceWriter, rs.getTracingContext()), nil } // GetStore returns a mounted Store for a given StoreKey. If the StoreKey does