chore: move counter to testutils (cosmos#20281)

notional-labs · May 6, 2024 · 271a46c · 271a46c
1 parent ccc0419
commit 271a46c
Show file tree

Hide file tree

Showing 24 changed files with 19 additions and 19 deletions.
diff --git a/client/fuzz_test.go b/client/fuzz_test.go
@@ -8,7 +8,7 @@ import (
 	"google.golang.org/grpc/metadata"
 
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
-	"github.com/cosmos/cosmos-sdk/x/counter/types"
+	"github.com/cosmos/cosmos-sdk/testutil/x/counter/types"
 )
 
 type fuzzSuite struct {

diff --git a/client/grpc_query_test.go b/client/grpc_query_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/runtime"
 	"github.com/cosmos/cosmos-sdk/testutil/integration"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
+	"github.com/cosmos/cosmos-sdk/testutil/x/counter"
+	counterkeeper "github.com/cosmos/cosmos-sdk/testutil/x/counter/keeper"
+	countertypes "github.com/cosmos/cosmos-sdk/testutil/x/counter/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
-	"github.com/cosmos/cosmos-sdk/x/counter"
-	counterkeeper "github.com/cosmos/cosmos-sdk/x/counter/keeper"
-	countertypes "github.com/cosmos/cosmos-sdk/x/counter/types"
 )
 
 type IntegrationTestSuite struct {

diff --git a/client/tx/aux_builder_test.go b/client/tx/aux_builder_test.go
@@ -11,12 +11,12 @@ import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
+	"github.com/cosmos/cosmos-sdk/testutil/x/counter"
+	countertypes "github.com/cosmos/cosmos-sdk/testutil/x/counter/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	typestx "github.com/cosmos/cosmos-sdk/types/tx"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
-	"github.com/cosmos/cosmos-sdk/x/counter"
-	countertypes "github.com/cosmos/cosmos-sdk/x/counter/types"
 )
 
 const (

diff --git a/client/tx/tx_test.go b/client/tx/tx_test.go
@@ -21,11 +21,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
+	countertypes "github.com/cosmos/cosmos-sdk/testutil/x/counter/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	txtypes "github.com/cosmos/cosmos-sdk/types/tx"
 	signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
-	countertypes "github.com/cosmos/cosmos-sdk/x/counter/types"
 )
 
 func newTestTxConfig() (client.TxConfig, codec.Codec) {

diff --git a/codec/bench_test.go b/codec/bench_test.go
@@ -12,8 +12,8 @@ import (
 	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
+	countertypes "github.com/cosmos/cosmos-sdk/testutil/x/counter/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	countertypes "github.com/cosmos/cosmos-sdk/x/counter/types"
 )
 
 type msgCounterWrapper struct {

diff --git a/codec/proto_codec_test.go b/codec/proto_codec_test.go
@@ -19,8 +19,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
+	countertypes "github.com/cosmos/cosmos-sdk/testutil/x/counter/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	countertypes "github.com/cosmos/cosmos-sdk/x/counter/types"
 )
 
 func createTestInterfaceRegistry() types.InterfaceRegistry {

diff --git a/runtime/router_test.go b/runtime/router_test.go
@@ -14,8 +14,8 @@ import (
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/runtime"
 	"github.com/cosmos/cosmos-sdk/testutil"
-	counterkeeper "github.com/cosmos/cosmos-sdk/x/counter/keeper"
-	countertypes "github.com/cosmos/cosmos-sdk/x/counter/types"
+	counterkeeper "github.com/cosmos/cosmos-sdk/testutil/x/counter/keeper"
+	countertypes "github.com/cosmos/cosmos-sdk/testutil/x/counter/types"
 )
 
 func TestRouterService(t *testing.T) {

diff --git a/x/counter/README.md → testutil/x/counter/README.md b/x/counter/README.md → testutil/x/counter/README.md
diff --git a/x/counter/depinject.go → testutil/x/counter/depinject.go b/x/counter/depinject.go → testutil/x/counter/depinject.go
@@ -6,7 +6,7 @@ import (
 	"cosmossdk.io/depinject"
 	"cosmossdk.io/depinject/appconfig"
 
-	"github.com/cosmos/cosmos-sdk/x/counter/keeper"
+	"github.com/cosmos/cosmos-sdk/testutil/x/counter/keeper"
 )
 
 var _ depinject.OnePerModuleType = AppModule{}

diff --git a/x/counter/keeper/keeper.go → testutil/x/counter/keeper/keeper.go b/x/counter/keeper/keeper.go → testutil/x/counter/keeper/keeper.go
@@ -12,7 +12,7 @@ import (
 	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/core/event"
 
-	"github.com/cosmos/cosmos-sdk/x/counter/types"
+	"github.com/cosmos/cosmos-sdk/testutil/x/counter/types"
 )
 
 var StoreKey = "Counter"

diff --git a/x/counter/module.go → testutil/x/counter/module.go b/x/counter/module.go → testutil/x/counter/module.go
@@ -6,9 +6,9 @@ import (
 	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/core/registry"
 
+	"github.com/cosmos/cosmos-sdk/testutil/x/counter/keeper"
+	"github.com/cosmos/cosmos-sdk/testutil/x/counter/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
-	"github.com/cosmos/cosmos-sdk/x/counter/keeper"
-	"github.com/cosmos/cosmos-sdk/x/counter/types"
 )
 
 var (

diff --git a/x/counter/proto/buf.gen.gogo.yaml → testutil/x/counter/proto/buf.gen.gogo.yaml b/x/counter/proto/buf.gen.gogo.yaml → testutil/x/counter/proto/buf.gen.gogo.yaml
diff --git a/x/counter/proto/buf.gen.pulsar.yaml → testutil/x/counter/proto/buf.gen.pulsar.yaml b/x/counter/proto/buf.gen.pulsar.yaml → testutil/x/counter/proto/buf.gen.pulsar.yaml
diff --git a/x/counter/proto/buf.lock → testutil/x/counter/proto/buf.lock b/x/counter/proto/buf.lock → testutil/x/counter/proto/buf.lock
diff --git a/x/counter/proto/buf.yaml → testutil/x/counter/proto/buf.yaml b/x/counter/proto/buf.yaml → testutil/x/counter/proto/buf.yaml
diff --git a/...oto/cosmos/counter/module/v1/module.proto → ...oto/cosmos/counter/module/v1/module.proto b/...oto/cosmos/counter/module/v1/module.proto → ...oto/cosmos/counter/module/v1/module.proto
@@ -7,7 +7,7 @@ import "cosmos/app/v1alpha1/module.proto";
 // Module is the config object of the counter module.
 message Module {
   option (cosmos.app.v1alpha1.module) = {
-    go_import: "github.com/cosmos/cosmos-sdk/x/counter"
+    go_import: "github.com/cosmos/cosmos-sdk/testutil/x/counter"
   };
 
   // authority defines the custom module authority. If not set, defaults to the governance module.

diff --git a/...unter/proto/cosmos/counter/v1/query.proto → ...unter/proto/cosmos/counter/v1/query.proto b/...unter/proto/cosmos/counter/v1/query.proto → ...unter/proto/cosmos/counter/v1/query.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 package cosmos.counter.v1;
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/counter/types";
+option go_package = "github.com/cosmos/cosmos-sdk/testutil/x/counter/types";
 
 // Query defines the gRPC querier service.
 service Query {

diff --git a/x/counter/proto/cosmos/counter/v1/tx.proto → .../counter/proto/cosmos/counter/v1/tx.proto b/x/counter/proto/cosmos/counter/v1/tx.proto → .../counter/proto/cosmos/counter/v1/tx.proto
@@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto";
 import "cosmos/msg/v1/msg.proto";
 import "amino/amino.proto";
 
-option go_package = "github.com/cosmos/cosmos-sdk/x/counter/types";
+option go_package = "github.com/cosmos/cosmos-sdk/testutil/x/counter/types";
 
 // Msg defines the counter Msg service.
 service Msg {

diff --git a/x/counter/testutil/expected_keepers_mocks.go → ...ounter/testutil/expected_keepers_mocks.go b/x/counter/testutil/expected_keepers_mocks.go → ...ounter/testutil/expected_keepers_mocks.go
diff --git a/x/counter/types/codec.go → testutil/x/counter/types/codec.go b/x/counter/types/codec.go → testutil/x/counter/types/codec.go
diff --git a/x/counter/types/keys.go → testutil/x/counter/types/keys.go b/x/counter/types/keys.go → testutil/x/counter/types/keys.go
diff --git a/x/counter/types/query.pb.go → testutil/x/counter/types/query.pb.go b/x/counter/types/query.pb.go → testutil/x/counter/types/query.pb.go
diff --git a/x/counter/types/tx.pb.go → testutil/x/counter/types/tx.pb.go b/x/counter/types/tx.pb.go → testutil/x/counter/types/tx.pb.go
diff --git a/types/mempool/mempool_test.go b/types/mempool/mempool_test.go
@@ -16,12 +16,12 @@ import (
 
 	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
+	"github.com/cosmos/cosmos-sdk/testutil/x/counter"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/mempool"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	txsigning "github.com/cosmos/cosmos-sdk/types/tx/signing"
-	"github.com/cosmos/cosmos-sdk/x/counter"
 )
 
 // testPubKey is a dummy implementation of PubKey used for testing.