From 04db139e8ab6c6b8aade44898aa1bbcda6b24207 Mon Sep 17 00:00:00 2001 From: Marko Date: Mon, 24 Oct 2022 14:02:17 +0200 Subject: [PATCH] chore: move pruning to store (#13609) * move pruning to store * add changelog entry Co-authored-by: Julien Robert --- CHANGELOG.md | 1 + baseapp/abci_test.go | 2 +- baseapp/baseapp_test.go | 2 +- baseapp/deliver_tx_test.go | 2 +- baseapp/options.go | 2 +- client/pruning/main.go | 2 +- server/config/config.go | 2 +- server/mock/store.go | 2 +- server/pruning.go | 2 +- server/pruning_test.go | 2 +- server/start.go | 2 +- simapp/test_helpers.go | 2 +- store/iavl/store.go | 2 +- store/mem/store.go | 2 +- {pruning => store/pruning}/README.md | 0 {pruning => store/pruning}/export_test.go | 0 {pruning => store/pruning}/manager.go | 2 +- {pruning => store/pruning}/manager_test.go | 6 +++--- {pruning => store/pruning}/mock/db_mock.go | 0 {pruning => store/pruning}/types/options.go | 0 {pruning => store/pruning}/types/options_test.go | 0 store/rootmulti/dbadapter.go | 2 +- store/rootmulti/store.go | 4 ++-- store/rootmulti/store_test.go | 2 +- store/transient/store.go | 2 +- store/transient/store_test.go | 2 +- store/types/store.go | 2 +- testutil/network/network.go | 2 +- x/params/client/testutil/suite.go | 2 +- x/upgrade/types/storeloader_test.go | 2 +- 30 files changed, 28 insertions(+), 27 deletions(-) rename {pruning => store/pruning}/README.md (100%) rename {pruning => store/pruning}/export_test.go (100%) rename {pruning => store/pruning}/manager.go (99%) rename {pruning => store/pruning}/manager_test.go (99%) rename {pruning => store/pruning}/mock/db_mock.go (100%) rename {pruning => store/pruning}/types/options.go (100%) rename {pruning => store/pruning}/types/options_test.go (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c4b6cd0a733..0b949ffd2239 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -152,6 +152,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/gov) [#13160](https://github.com/cosmos/cosmos-sdk/pull/13160) Remove custom marshaling of proposl and voteoption. * (types) [#13430](https://github.com/cosmos/cosmos-sdk/pull/13430) Remove unused code `ResponseCheckTx` and `ResponseDeliverTx` * (store) [#13529](https://github.com/cosmos/cosmos-sdk/pull/13529) Add method `LatestVersion` to `MultiStore` interface, add method `SetQueryMultiStore` to baesapp to support alternative `MultiStore` implementation for query service. +* (pruning) [#13609]](https://github.com/cosmos/cosmos-sdk/pull/13609) Move pruning pacakge to be under store pacakge ### CLI Breaking Changes diff --git a/baseapp/abci_test.go b/baseapp/abci_test.go index 20b308cdfed8..c1e2934c7779 100644 --- a/baseapp/abci_test.go +++ b/baseapp/abci_test.go @@ -12,9 +12,9 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/snapshots" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index 697841e1a81d..42579f79c06d 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -9,7 +9,7 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/baseapp/deliver_tx_test.go b/baseapp/deliver_tx_test.go index b7daf0505bfc..dd819cccdd0e 100644 --- a/baseapp/deliver_tx_test.go +++ b/baseapp/deliver_tx_test.go @@ -31,10 +31,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/snapshots" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/store/rootmulti" storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/testutil" diff --git a/baseapp/options.go b/baseapp/options.go index 1a304e4eab1b..aab297edb52e 100644 --- a/baseapp/options.go +++ b/baseapp/options.go @@ -7,10 +7,10 @@ import ( dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/codec/types" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/snapshots" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" "github.com/cosmos/cosmos-sdk/store" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/client/pruning/main.go b/client/pruning/main.go index fb62dd21a050..7c16cd64b26a 100644 --- a/client/pruning/main.go +++ b/client/pruning/main.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/viper" "github.com/cosmos/cosmos-sdk/client/flags" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/store/rootmulti" "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" diff --git a/server/config/config.go b/server/config/config.go index eb56824688e3..bbbde8e0b397 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/viper" clientflags "github.com/cosmos/cosmos-sdk/client/flags" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/server/mock/store.go b/server/mock/store.go index 486b15e98192..31c6c157e0d6 100644 --- a/server/mock/store.go +++ b/server/mock/store.go @@ -6,8 +6,8 @@ import ( protoio "github.com/cosmos/gogoproto/io" dbm "github.com/tendermint/tm-db" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/server/pruning.go b/server/pruning.go index 2e21579032c1..342b3cb4331e 100644 --- a/server/pruning.go +++ b/server/pruning.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cast" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/server/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" ) // GetPruningOptionsFromFlags parses command flags and returns the correct diff --git a/server/pruning_test.go b/server/pruning_test.go index 2d7bc976d92e..bca90607eb55 100644 --- a/server/pruning_test.go +++ b/server/pruning_test.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/require" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" ) func TestGetPruningOptionsFromFlags(t *testing.T) { diff --git a/server/start.go b/server/start.go index 2e5c07bcb250..72fd27229dc9 100644 --- a/server/start.go +++ b/server/start.go @@ -24,13 +24,13 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/server/api" serverconfig "github.com/cosmos/cosmos-sdk/server/config" servergrpc "github.com/cosmos/cosmos-sdk/server/grpc" "github.com/cosmos/cosmos-sdk/server/rosetta" crgserver "github.com/cosmos/cosmos-sdk/server/rosetta/lib/server" "github.com/cosmos/cosmos-sdk/server/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/telemetry" sdktypes "github.com/cosmos/cosmos-sdk/types" ) diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index 0741de8151d4..b5b4aff06b51 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/server" servertypes "github.com/cosmos/cosmos-sdk/server/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/testutil/mock" "github.com/cosmos/cosmos-sdk/testutil/network" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" diff --git a/store/iavl/store.go b/store/iavl/store.go index e622dbd28fcc..b93a3502547b 100644 --- a/store/iavl/store.go +++ b/store/iavl/store.go @@ -13,9 +13,9 @@ import ( tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" dbm "github.com/tendermint/tm-db" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/store/cachekv" "github.com/cosmos/cosmos-sdk/store/listenkv" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/store/tracekv" "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/telemetry" diff --git a/store/mem/store.go b/store/mem/store.go index 51968610950f..2f940c4e33e8 100644 --- a/store/mem/store.go +++ b/store/mem/store.go @@ -5,10 +5,10 @@ import ( dbm "github.com/tendermint/tm-db" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/store/cachekv" "github.com/cosmos/cosmos-sdk/store/dbadapter" "github.com/cosmos/cosmos-sdk/store/listenkv" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/store/tracekv" "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/pruning/README.md b/store/pruning/README.md similarity index 100% rename from pruning/README.md rename to store/pruning/README.md diff --git a/pruning/export_test.go b/store/pruning/export_test.go similarity index 100% rename from pruning/export_test.go rename to store/pruning/export_test.go diff --git a/pruning/manager.go b/store/pruning/manager.go similarity index 99% rename from pruning/manager.go rename to store/pruning/manager.go index ac1172ebb86e..5da790dc675e 100644 --- a/pruning/manager.go +++ b/store/pruning/manager.go @@ -9,7 +9,7 @@ import ( "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" - "github.com/cosmos/cosmos-sdk/pruning/types" + "github.com/cosmos/cosmos-sdk/store/pruning/types" ) // Manager is an abstraction to handle the logic needed for diff --git a/pruning/manager_test.go b/store/pruning/manager_test.go similarity index 99% rename from pruning/manager_test.go rename to store/pruning/manager_test.go index 85d38e8c8af7..adecdd161b6b 100644 --- a/pruning/manager_test.go +++ b/store/pruning/manager_test.go @@ -11,9 +11,9 @@ import ( "github.com/tendermint/tendermint/libs/log" db "github.com/tendermint/tm-db" - "github.com/cosmos/cosmos-sdk/pruning" - "github.com/cosmos/cosmos-sdk/pruning/mock" - "github.com/cosmos/cosmos-sdk/pruning/types" + "github.com/cosmos/cosmos-sdk/store/pruning" + "github.com/cosmos/cosmos-sdk/store/pruning/mock" + "github.com/cosmos/cosmos-sdk/store/pruning/types" ) const dbErr = "db error" diff --git a/pruning/mock/db_mock.go b/store/pruning/mock/db_mock.go similarity index 100% rename from pruning/mock/db_mock.go rename to store/pruning/mock/db_mock.go diff --git a/pruning/types/options.go b/store/pruning/types/options.go similarity index 100% rename from pruning/types/options.go rename to store/pruning/types/options.go diff --git a/pruning/types/options_test.go b/store/pruning/types/options_test.go similarity index 100% rename from pruning/types/options_test.go rename to store/pruning/types/options_test.go diff --git a/store/rootmulti/dbadapter.go b/store/rootmulti/dbadapter.go index 00ca37553823..02b11ebd3f2a 100644 --- a/store/rootmulti/dbadapter.go +++ b/store/rootmulti/dbadapter.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/dbadapter" "github.com/cosmos/cosmos-sdk/store/types" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" ) var commithash = []byte("FAKE_HASH") diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index f4dfcedd4527..486d2d625905 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -16,14 +16,14 @@ import ( "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" - "github.com/cosmos/cosmos-sdk/pruning" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" "github.com/cosmos/cosmos-sdk/store/cachemulti" "github.com/cosmos/cosmos-sdk/store/dbadapter" "github.com/cosmos/cosmos-sdk/store/iavl" "github.com/cosmos/cosmos-sdk/store/listenkv" "github.com/cosmos/cosmos-sdk/store/mem" + "github.com/cosmos/cosmos-sdk/store/pruning" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/store/tracekv" "github.com/cosmos/cosmos-sdk/store/transient" "github.com/cosmos/cosmos-sdk/store/types" diff --git a/store/rootmulti/store_test.go b/store/rootmulti/store_test.go index a219593fbb86..9f8fdebd2b1c 100644 --- a/store/rootmulti/store_test.go +++ b/store/rootmulti/store_test.go @@ -13,11 +13,11 @@ import ( "github.com/cosmos/cosmos-sdk/codec" codecTypes "github.com/cosmos/cosmos-sdk/codec/types" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/store/cachemulti" "github.com/cosmos/cosmos-sdk/store/iavl" sdkmaps "github.com/cosmos/cosmos-sdk/store/internal/maps" "github.com/cosmos/cosmos-sdk/store/listenkv" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/store/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/store/transient/store.go b/store/transient/store.go index 4d4fc5b81d6e..207eee918490 100644 --- a/store/transient/store.go +++ b/store/transient/store.go @@ -3,8 +3,8 @@ package transient import ( dbm "github.com/tendermint/tm-db" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/store/dbadapter" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/store/transient/store_test.go b/store/transient/store_test.go index 273a0ff93045..56b019b8b108 100644 --- a/store/transient/store_test.go +++ b/store/transient/store_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/store/transient" ) diff --git a/store/types/store.go b/store/types/store.go index 403ede5f706f..65a9b1e2bfc2 100644 --- a/store/types/store.go +++ b/store/types/store.go @@ -7,8 +7,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" dbm "github.com/tendermint/tm-db" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/types/kv" ) diff --git a/testutil/network/network.go b/testutil/network/network.go index 960c5eb95818..68f2c72d7526 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -36,12 +36,12 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/server/api" srvconfig "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" diff --git a/x/params/client/testutil/suite.go b/x/params/client/testutil/suite.go index beeca2681dbe..a3cd9b4b8b52 100644 --- a/x/params/client/testutil/suite.go +++ b/x/params/client/testutil/suite.go @@ -11,9 +11,9 @@ import ( "cosmossdk.io/depinject" "github.com/cosmos/cosmos-sdk/baseapp" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" "github.com/cosmos/cosmos-sdk/runtime" servertypes "github.com/cosmos/cosmos-sdk/server/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/upgrade/types/storeloader_test.go b/x/upgrade/types/storeloader_test.go index b392abef46d0..d0659635ef18 100644 --- a/x/upgrade/types/storeloader_test.go +++ b/x/upgrade/types/storeloader_test.go @@ -14,7 +14,7 @@ import ( dbm "github.com/tendermint/tm-db" "github.com/cosmos/cosmos-sdk/baseapp" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/store/rootmulti" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types"