refactor: move snapshotstore under store (#14048)

* Move snapshotstore under store * add changelog entry * fix build * move snapshot proto package * make proto-gen * Update CHANGELOG.md Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
cosmos · Nov 29, 2022 · 2e3d38f · 2e3d38f
1 parent 3e85182
commit 2e3d38f
Show file tree

Hide file tree

Showing 29 changed files with 557 additions and 550 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -180,6 +180,7 @@ extension interfaces. `module.Manager.Modules` is now of type `map[string]interf
 * (signing) [#13701](https://github.com/cosmos/cosmos-sdk/pull/) Add `context.Context` as an argument to SignModeHandler's `GetSignBytes` method and `x/auth/signing.VerifySignature`. You can pass `nil` for now, it will only be used once SIGN_MODE_TEXTUAL is live.
 * (x/group) [#13876](https://github.com/cosmos/cosmos-sdk/pull/13876) Add `GetMinExecutionPeriod` method on DecisionPolicy interface.
 * (x/auth)[#13780](https://github.com/cosmos/cosmos-sdk/pull/13780) Querying with `id` (type of int64) in `AccountAddressByID` grpc query now throws error, use account-id(type of uint64) instead.
+* (snapshots) [14048](https://github.com/cosmos/cosmos-sdk/pull/14048) Move the Snapshot package to the store package. This is done in an effort group all storage related logic under one package. 
 * (baseapp) [#14050](https://github.com/cosmos/cosmos-sdk/pull/14050) refactor `ABCIListener` interface to accept go contexts
 
 ### CLI Breaking Changes

diff --git a/...base/snapshots/v1beta1/snapshot.pulsar.go → ...tore/snapshots/v1beta1/snapshot.pulsar.go b/...base/snapshots/v1beta1/snapshot.pulsar.go → ...tore/snapshots/v1beta1/snapshot.pulsar.go
diff --git a/baseapp/abci.go b/baseapp/abci.go
@@ -17,7 +17,7 @@ import (
 	grpcstatus "google.golang.org/grpc/status"
 
 	"github.com/cosmos/cosmos-sdk/codec"
-	snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/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/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"
 
-	"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/snapshots"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
@@ -15,8 +15,8 @@ import (
 	"golang.org/x/exp/maps"
 
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
-	"github.com/cosmos/cosmos-sdk/snapshots"
 	"github.com/cosmos/cosmos-sdk/store"
+	"github.com/cosmos/cosmos-sdk/store/snapshots"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

diff --git a/baseapp/deliver_tx_test.go b/baseapp/deliver_tx_test.go
@@ -37,10 +37,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/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"
+	"github.com/cosmos/cosmos-sdk/store/snapshots"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/cosmos/cosmos-sdk/testutil"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"

diff --git 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"
-	"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"
+	"github.com/cosmos/cosmos-sdk/store/snapshots"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/mempool"
 )

diff --git a/...mos/base/snapshots/v1beta1/snapshot.proto → ...se/store/snapshots/v1beta1/snapshot.proto b/...mos/base/snapshots/v1beta1/snapshot.proto → ...se/store/snapshots/v1beta1/snapshot.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
-package cosmos.base.snapshots.v1beta1;
+package cosmos.base.store.snapshots.v1beta1;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/snapshots/types";
+option go_package = "github.com/cosmos/cosmos-sdk/store/snapshots/types";
 
 // Snapshot contains Tendermint state sync snapshot info.
 message Snapshot {
@@ -16,7 +16,7 @@ message Snapshot {
 
 // Metadata contains SDK-specific snapshot metadata.
 message Metadata {
-  repeated bytes chunk_hashes = 1; // SHA-256 chunk hashes
+  repeated bytes chunk_hashes = 1;  // SHA-256 chunk hashes
 }
 
 // SnapshotItem is an item contained in a rootmulti.Store snapshot.

diff --git 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"
 
-	snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
 	pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go
@@ -1,12 +1,13 @@
 package cmd
 
 import (
-	rosettaCmd "cosmossdk.io/tools/rosetta/cmd"
 	"errors"
 	"io"
 	"os"
 	"path/filepath"
 
+	rosettaCmd "cosmossdk.io/tools/rosetta/cmd"
+
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -28,9 +29,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	"github.com/cosmos/cosmos-sdk/snapshots"
-	snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
 	"github.com/cosmos/cosmos-sdk/store"
+	"github.com/cosmos/cosmos-sdk/store/snapshots"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"

diff --git a/store/rootmulti/snapshot_test.go b/store/rootmulti/snapshot_test.go
@@ -13,10 +13,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/cosmos/cosmos-sdk/snapshots"
-	snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
 	"github.com/cosmos/cosmos-sdk/store/iavl"
 	"github.com/cosmos/cosmos-sdk/store/rootmulti"
+	"github.com/cosmos/cosmos-sdk/store/snapshots"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	"github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"

diff --git 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"
 
-	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"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/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/snapshots/README.md → store/snapshots/README.md b/snapshots/README.md → store/snapshots/README.md
diff --git a/snapshots/chunk.go → store/snapshots/chunk.go b/snapshots/chunk.go → store/snapshots/chunk.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"math"
 
-	snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 

diff --git a/snapshots/chunk_test.go → store/snapshots/chunk_test.go b/snapshots/chunk_test.go → store/snapshots/chunk_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/cosmos/cosmos-sdk/snapshots"
+	"github.com/cosmos/cosmos-sdk/store/snapshots"
 )
 
 func TestChunkWriter(t *testing.T) {

diff --git a/snapshots/helpers_test.go → store/snapshots/helpers_test.go b/snapshots/helpers_test.go → store/snapshots/helpers_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	db "github.com/tendermint/tm-db"
 
-	"github.com/cosmos/cosmos-sdk/snapshots"
-	snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
+	"github.com/cosmos/cosmos-sdk/store/snapshots"
+	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	"github.com/cosmos/cosmos-sdk/testutil"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

diff --git a/snapshots/manager.go → store/snapshots/manager.go b/snapshots/manager.go → store/snapshots/manager.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/tendermint/tendermint/libs/log"
 
-	"github.com/cosmos/cosmos-sdk/snapshots/types"
+	"github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 

diff --git a/snapshots/manager_test.go → store/snapshots/manager_test.go b/snapshots/manager_test.go → store/snapshots/manager_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"
 
-	"github.com/cosmos/cosmos-sdk/snapshots"
-	"github.com/cosmos/cosmos-sdk/snapshots/types"
+	"github.com/cosmos/cosmos-sdk/store/snapshots"
+	"github.com/cosmos/cosmos-sdk/store/snapshots/types"
 )
 
 var opts = types.NewSnapshotOptions(1500, 2)

diff --git a/snapshots/store.go → store/snapshots/store.go b/snapshots/store.go → store/snapshots/store.go
@@ -13,7 +13,7 @@ import (
 	"github.com/cosmos/gogoproto/proto"
 	db "github.com/tendermint/tm-db"
 
-	"github.com/cosmos/cosmos-sdk/snapshots/types"
+	"github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 

diff --git a/snapshots/store_test.go → store/snapshots/store_test.go b/snapshots/store_test.go → store/snapshots/store_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/require"
 	db "github.com/tendermint/tm-db"
 
-	"github.com/cosmos/cosmos-sdk/snapshots"
-	"github.com/cosmos/cosmos-sdk/snapshots/types"
+	"github.com/cosmos/cosmos-sdk/store/snapshots"
+	"github.com/cosmos/cosmos-sdk/store/snapshots/types"
 	"github.com/cosmos/cosmos-sdk/testutil"
 )
 

diff --git a/snapshots/stream.go → store/snapshots/stream.go b/snapshots/stream.go → store/snapshots/stream.go
diff --git a/snapshots/types/convert.go → store/snapshots/types/convert.go b/snapshots/types/convert.go → store/snapshots/types/convert.go
diff --git a/snapshots/types/errors.go → store/snapshots/types/errors.go b/snapshots/types/errors.go → store/snapshots/types/errors.go
diff --git a/snapshots/types/format.go → store/snapshots/types/format.go b/snapshots/types/format.go → store/snapshots/types/format.go
diff --git a/snapshots/types/options.go → store/snapshots/types/options.go b/snapshots/types/options.go → store/snapshots/types/options.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"io"
     	"math"
-    	snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
+    	snapshottypes "github.com/cosmos/cosmos-sdk/store/snapshots/types"
     	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
     )
@@ Expand Down @@