From 271a46c89a616dc825a7415cedda4e4c40a7e653 Mon Sep 17 00:00:00 2001 From: Marko Date: Mon, 6 May 2024 18:07:53 +0200 Subject: [PATCH] chore: move counter to testutils (#20281) --- client/fuzz_test.go | 2 +- client/grpc_query_test.go | 6 +++--- client/tx/aux_builder_test.go | 4 ++-- client/tx/tx_test.go | 2 +- codec/bench_test.go | 2 +- codec/proto_codec_test.go | 2 +- runtime/router_test.go | 4 ++-- {x => testutil/x}/counter/README.md | 0 {x => testutil/x}/counter/depinject.go | 2 +- {x => testutil/x}/counter/keeper/keeper.go | 2 +- {x => testutil/x}/counter/module.go | 4 ++-- {x => testutil/x}/counter/proto/buf.gen.gogo.yaml | 0 {x => testutil/x}/counter/proto/buf.gen.pulsar.yaml | 0 {x => testutil/x}/counter/proto/buf.lock | 0 {x => testutil/x}/counter/proto/buf.yaml | 0 .../x}/counter/proto/cosmos/counter/module/v1/module.proto | 2 +- .../x}/counter/proto/cosmos/counter/v1/query.proto | 2 +- {x => testutil/x}/counter/proto/cosmos/counter/v1/tx.proto | 2 +- .../x}/counter/testutil/expected_keepers_mocks.go | 0 {x => testutil/x}/counter/types/codec.go | 0 {x => testutil/x}/counter/types/keys.go | 0 {x => testutil/x}/counter/types/query.pb.go | 0 {x => testutil/x}/counter/types/tx.pb.go | 0 types/mempool/mempool_test.go | 2 +- 24 files changed, 19 insertions(+), 19 deletions(-) rename {x => testutil/x}/counter/README.md (100%) rename {x => testutil/x}/counter/depinject.go (93%) rename {x => testutil/x}/counter/keeper/keeper.go (96%) rename {x => testutil/x}/counter/module.go (91%) rename {x => testutil/x}/counter/proto/buf.gen.gogo.yaml (100%) rename {x => testutil/x}/counter/proto/buf.gen.pulsar.yaml (100%) rename {x => testutil/x}/counter/proto/buf.lock (100%) rename {x => testutil/x}/counter/proto/buf.yaml (100%) rename {x => testutil/x}/counter/proto/cosmos/counter/module/v1/module.proto (84%) rename {x => testutil/x}/counter/proto/cosmos/counter/v1/query.proto (86%) rename {x => testutil/x}/counter/proto/cosmos/counter/v1/tx.proto (93%) rename {x => testutil/x}/counter/testutil/expected_keepers_mocks.go (100%) rename {x => testutil/x}/counter/types/codec.go (100%) rename {x => testutil/x}/counter/types/keys.go (100%) rename {x => testutil/x}/counter/types/query.pb.go (100%) rename {x => testutil/x}/counter/types/tx.pb.go (100%) diff --git a/client/fuzz_test.go b/client/fuzz_test.go index e8053c2d19..460e526cb9 100644 --- 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 index a07226e118..d0d43a6d30 100644 --- 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 index b0c7e3e874..fc15190d50 100644 --- 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 index 8859531dbd..77cd0401e5 100644 --- 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 index b52135a951..7a3956bab9 100644 --- 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 index d4d6d12bac..afa56efe04 100644 --- 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 index 1c1d3db19e..56783bfe23 100644 --- 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 b/testutil/x/counter/README.md similarity index 100% rename from x/counter/README.md rename to testutil/x/counter/README.md diff --git a/x/counter/depinject.go b/testutil/x/counter/depinject.go similarity index 93% rename from x/counter/depinject.go rename to testutil/x/counter/depinject.go index 4cbe20acf4..fcb8df1e3c 100644 --- a/x/counter/depinject.go +++ b/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 b/testutil/x/counter/keeper/keeper.go similarity index 96% rename from x/counter/keeper/keeper.go rename to testutil/x/counter/keeper/keeper.go index f8d5c01cc2..e3389089da 100644 --- a/x/counter/keeper/keeper.go +++ b/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 b/testutil/x/counter/module.go similarity index 91% rename from x/counter/module.go rename to testutil/x/counter/module.go index 57340e4455..f5a4a0a683 100644 --- a/x/counter/module.go +++ b/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 b/testutil/x/counter/proto/buf.gen.gogo.yaml similarity index 100% rename from x/counter/proto/buf.gen.gogo.yaml rename to testutil/x/counter/proto/buf.gen.gogo.yaml diff --git a/x/counter/proto/buf.gen.pulsar.yaml b/testutil/x/counter/proto/buf.gen.pulsar.yaml similarity index 100% rename from x/counter/proto/buf.gen.pulsar.yaml rename to testutil/x/counter/proto/buf.gen.pulsar.yaml diff --git a/x/counter/proto/buf.lock b/testutil/x/counter/proto/buf.lock similarity index 100% rename from x/counter/proto/buf.lock rename to testutil/x/counter/proto/buf.lock diff --git a/x/counter/proto/buf.yaml b/testutil/x/counter/proto/buf.yaml similarity index 100% rename from x/counter/proto/buf.yaml rename to testutil/x/counter/proto/buf.yaml diff --git a/x/counter/proto/cosmos/counter/module/v1/module.proto b/testutil/x/counter/proto/cosmos/counter/module/v1/module.proto similarity index 84% rename from x/counter/proto/cosmos/counter/module/v1/module.proto rename to testutil/x/counter/proto/cosmos/counter/module/v1/module.proto index fc1b347d5d..f4be1da83c 100644 --- a/x/counter/proto/cosmos/counter/module/v1/module.proto +++ b/testutil/x/counter/proto/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/x/counter/proto/cosmos/counter/v1/query.proto b/testutil/x/counter/proto/cosmos/counter/v1/query.proto similarity index 86% rename from x/counter/proto/cosmos/counter/v1/query.proto rename to testutil/x/counter/proto/cosmos/counter/v1/query.proto index 18ef0b6ae9..d8151da083 100644 --- a/x/counter/proto/cosmos/counter/v1/query.proto +++ b/testutil/x/counter/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 b/testutil/x/counter/proto/cosmos/counter/v1/tx.proto similarity index 93% rename from x/counter/proto/cosmos/counter/v1/tx.proto rename to testutil/x/counter/proto/cosmos/counter/v1/tx.proto index 0d4a2ef480..771d683cee 100644 --- a/x/counter/proto/cosmos/counter/v1/tx.proto +++ b/testutil/x/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 b/testutil/x/counter/testutil/expected_keepers_mocks.go similarity index 100% rename from x/counter/testutil/expected_keepers_mocks.go rename to testutil/x/counter/testutil/expected_keepers_mocks.go diff --git a/x/counter/types/codec.go b/testutil/x/counter/types/codec.go similarity index 100% rename from x/counter/types/codec.go rename to testutil/x/counter/types/codec.go diff --git a/x/counter/types/keys.go b/testutil/x/counter/types/keys.go similarity index 100% rename from x/counter/types/keys.go rename to testutil/x/counter/types/keys.go diff --git a/x/counter/types/query.pb.go b/testutil/x/counter/types/query.pb.go similarity index 100% rename from x/counter/types/query.pb.go rename to testutil/x/counter/types/query.pb.go diff --git a/x/counter/types/tx.pb.go b/testutil/x/counter/types/tx.pb.go similarity index 100% rename from x/counter/types/tx.pb.go rename to testutil/x/counter/types/tx.pb.go diff --git a/types/mempool/mempool_test.go b/types/mempool/mempool_test.go index cdc0756141..9b9ad454ea 100644 --- 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.