diff --git a/x/bank/alias.go b/x/bank/alias.go index faa59aa3fd98..9811c9e001ee 100644 --- a/x/bank/alias.go +++ b/x/bank/alias.go @@ -3,8 +3,8 @@ package bank // nolint import ( - "github.com/cosmos/cosmos-sdk/x/bank/internal/keeper" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/keeper" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) const ( diff --git a/x/bank/app_test.go b/x/bank/app_test.go index 46a33d3f62f6..4a36d2d8af77 100644 --- a/x/bank/app_test.go +++ b/x/bank/app_test.go @@ -16,7 +16,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" authexported "github.com/cosmos/cosmos-sdk/x/auth/exported" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) type ( diff --git a/x/bank/client/cli/query.go b/x/bank/client/cli/query.go index 046e84051448..e7327a091eb4 100644 --- a/x/bank/client/cli/query.go +++ b/x/bank/client/cli/query.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) const ( diff --git a/x/bank/client/cli/tx.go b/x/bank/client/cli/tx.go index b2b36c45dbe7..0764045968a7 100644 --- a/x/bank/client/cli/tx.go +++ b/x/bank/client/cli/tx.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" authclient "github.com/cosmos/cosmos-sdk/x/auth/client" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/bank/client/rest/query.go b/x/bank/client/rest/query.go index eb1f3463b7a6..99b3680bbb16 100644 --- a/x/bank/client/rest/query.go +++ b/x/bank/client/rest/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/context" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) // QueryBalancesRequestHandlerFn returns a REST handler that queries for all diff --git a/x/bank/client/rest/tx.go b/x/bank/client/rest/tx.go index 52fa9f25136b..30178166bb5f 100644 --- a/x/bank/client/rest/tx.go +++ b/x/bank/client/rest/tx.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" authclient "github.com/cosmos/cosmos-sdk/x/auth/client" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) // SendReq defines the properties of a send request's body. diff --git a/x/bank/handler.go b/x/bank/handler.go index 3c83ec4c2af4..30341ab47b57 100644 --- a/x/bank/handler.go +++ b/x/bank/handler.go @@ -3,8 +3,8 @@ package bank import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/bank/internal/keeper" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/keeper" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) // NewHandler returns a handler for "bank" type messages. diff --git a/x/bank/internal/keeper/invariants.go b/x/bank/keeper/invariants.go similarity index 94% rename from x/bank/internal/keeper/invariants.go rename to x/bank/keeper/invariants.go index 65730451261b..3833c034d3df 100644 --- a/x/bank/internal/keeper/invariants.go +++ b/x/bank/keeper/invariants.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) // RegisterInvariants registers the bank module invariants diff --git a/x/bank/internal/keeper/keeper.go b/x/bank/keeper/keeper.go similarity index 99% rename from x/bank/internal/keeper/keeper.go rename to x/bank/keeper/keeper.go index 1475a85cfb92..b72687ddbcb2 100644 --- a/x/bank/internal/keeper/keeper.go +++ b/x/bank/keeper/keeper.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/bank/internal/keeper/keeper_test.go b/x/bank/keeper/keeper_test.go similarity index 99% rename from x/bank/internal/keeper/keeper_test.go rename to x/bank/keeper/keeper_test.go index d71f1274f1d2..472fe39972d5 100644 --- a/x/bank/internal/keeper/keeper_test.go +++ b/x/bank/keeper/keeper_test.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth" "github.com/cosmos/cosmos-sdk/x/auth/vesting" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) const ( diff --git a/x/bank/internal/keeper/querier.go b/x/bank/keeper/querier.go similarity index 96% rename from x/bank/internal/keeper/querier.go rename to x/bank/keeper/querier.go index 072511b2d2a8..be17b371629a 100644 --- a/x/bank/internal/keeper/querier.go +++ b/x/bank/keeper/querier.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) // NewQuerier returns a new sdk.Keeper instance. diff --git a/x/bank/internal/keeper/querier_test.go b/x/bank/keeper/querier_test.go similarity index 96% rename from x/bank/internal/keeper/querier_test.go rename to x/bank/keeper/querier_test.go index 643f7b1798cf..3732aaa74429 100644 --- a/x/bank/internal/keeper/querier_test.go +++ b/x/bank/keeper/querier_test.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/cosmos/cosmos-sdk/x/bank/internal/keeper" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/keeper" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) func (suite *IntegrationTestSuite) TestQuerier_QueryBalance() { diff --git a/x/bank/module.go b/x/bank/module.go index dfde67f4a85e..7cb86714272c 100644 --- a/x/bank/module.go +++ b/x/bank/module.go @@ -16,9 +16,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/bank/client/cli" "github.com/cosmos/cosmos-sdk/x/bank/client/rest" - "github.com/cosmos/cosmos-sdk/x/bank/internal/keeper" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/bank/simulation" + "github.com/cosmos/cosmos-sdk/x/bank/types" sim "github.com/cosmos/cosmos-sdk/x/simulation" ) diff --git a/x/bank/simulation/genesis.go b/x/bank/simulation/genesis.go index b593fa05b070..97716bd2fa6c 100644 --- a/x/bank/simulation/genesis.go +++ b/x/bank/simulation/genesis.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" ) // Simulation parameter constants diff --git a/x/bank/simulation/operations.go b/x/bank/simulation/operations.go index 2d9e8468359a..c3ff22f9ceed 100644 --- a/x/bank/simulation/operations.go +++ b/x/bank/simulation/operations.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp/helpers" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/bank/internal/keeper" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/keeper" + "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/simulation" ) diff --git a/x/bank/simulation/params.go b/x/bank/simulation/params.go index f5aa25bf6a0c..458a8a09a16e 100644 --- a/x/bank/simulation/params.go +++ b/x/bank/simulation/params.go @@ -6,7 +6,7 @@ import ( "fmt" "math/rand" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/simulation" ) diff --git a/x/bank/internal/types/codec.go b/x/bank/types/codec.go similarity index 100% rename from x/bank/internal/types/codec.go rename to x/bank/types/codec.go diff --git a/x/bank/internal/types/errors.go b/x/bank/types/errors.go similarity index 100% rename from x/bank/internal/types/errors.go rename to x/bank/types/errors.go diff --git a/x/bank/internal/types/events.go b/x/bank/types/events.go similarity index 100% rename from x/bank/internal/types/events.go rename to x/bank/types/events.go diff --git a/x/bank/internal/types/expected_keepers.go b/x/bank/types/expected_keepers.go similarity index 100% rename from x/bank/internal/types/expected_keepers.go rename to x/bank/types/expected_keepers.go diff --git a/x/bank/internal/types/genesis.go b/x/bank/types/genesis.go similarity index 100% rename from x/bank/internal/types/genesis.go rename to x/bank/types/genesis.go diff --git a/x/bank/internal/types/key.go b/x/bank/types/key.go similarity index 100% rename from x/bank/internal/types/key.go rename to x/bank/types/key.go diff --git a/x/bank/internal/types/key_test.go b/x/bank/types/key_test.go similarity index 91% rename from x/bank/internal/types/key_test.go rename to x/bank/types/key_test.go index a16a22381d6e..b1e5a7614106 100644 --- a/x/bank/internal/types/key_test.go +++ b/x/bank/types/key_test.go @@ -4,7 +4,7 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/bank/internal/types" + "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/require" ) diff --git a/x/bank/internal/types/msgs.go b/x/bank/types/msgs.go similarity index 100% rename from x/bank/internal/types/msgs.go rename to x/bank/types/msgs.go diff --git a/x/bank/internal/types/msgs_test.go b/x/bank/types/msgs_test.go similarity index 100% rename from x/bank/internal/types/msgs_test.go rename to x/bank/types/msgs_test.go diff --git a/x/bank/internal/types/params.go b/x/bank/types/params.go similarity index 100% rename from x/bank/internal/types/params.go rename to x/bank/types/params.go diff --git a/x/bank/internal/types/querier.go b/x/bank/types/querier.go similarity index 100% rename from x/bank/internal/types/querier.go rename to x/bank/types/querier.go