Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Rename x/{mod}/legacy to x/{mod}/migrations #9628

Merged
merged 8 commits into from
Jul 5, 2021
Merged

refactor: Rename x/{mod}/legacy to x/{mod}/migrations #9628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3c1fb55
rename legacy to migrations
likhita-809 Jul 5, 2021
15e797b
Merge branch 'master' of https://github.com/cosmos/cosmos-sdk into li…
likhita-809 Jul 5, 2021
898d992
fix lint issues
likhita-809 Jul 5, 2021
435a0b6
add changelog
likhita-809 Jul 5, 2021
e884105
run proto-all
likhita-809 Jul 5, 2021
62bdfc8
Merge branch 'master' of https://github.com/cosmos/cosmos-sdk into li…
likhita-809 Jul 5, 2021
edddd8b
move changelog to API-breaking section
likhita-809 Jul 5, 2021
4f2790b
Merge branch 'master' into likhita/rename-legacy-to-migrations
atheeshp Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ issues:
- text: "ST1016:"
linters:
- stylecheck
- path: "legacy"
- path: "migrations"
text: "SA1019:"
linters:
- staticcheck
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### API Breaking Changes

* [\#9628](https://github.com/cosmos/cosmos-sdk/pull/9628) Rename `x/{mod}/legacy` to `x/{mod}/migrations`.
* [\#9571](https://github.com/cosmos/cosmos-sdk/pull/9571) Implemented error handling for staking hooks, which now return an error on failure.
* [\#9427](https://github.com/cosmos/cosmos-sdk/pull/9427) Move simapp `FundAccount` and `FundModuleAccount` to `x/bank/testutil`
* (client/tx) [\#9421](https://github.com/cosmos/cosmos-sdk/pull/9421/) `BuildUnsignedTx`, `BuildSimTx`, `PrintUnsignedStdTx` functions are moved to
Expand All @@ -59,6 +60,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* [\#9371](https://github.com/cosmos/cosmos-sdk/pull/9371) Non-zero default fees/Server will error if there's an empty value for min-gas-price in app.toml

### Improvements

* (cli) [\#9593](https://github.com/cosmos/cosmos-sdk/pull/9593) Check if chain-id is blank before verifying signatures in multisign and error.

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion baseapp/baseapp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/cosmos/cosmos-sdk/store/rootmulti"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion baseapp/baseapp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion client/tx/legacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
)

Expand Down
2 changes: 1 addition & 1 deletion client/tx/legacy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/cosmos/cosmos-sdk/testutil/testdata"
"github.com/cosmos/cosmos-sdk/types"
signing2 "github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
"github.com/cosmos/cosmos-sdk/x/auth/tx"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
Expand Down
2 changes: 1 addition & 1 deletion codec/amino_codec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
"github.com/cosmos/cosmos-sdk/x/auth/client/rest"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

func createTestCodec() *codec.LegacyAmino {
Expand Down
2 changes: 1 addition & 1 deletion crypto/keys/multisig/multisig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/cosmos/cosmos-sdk/simapp"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

func TestNewMultiSig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion proto/cosmos/bank/v1beta1/bank.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ message Supply {
option (gogoproto.equal) = true;
option (gogoproto.goproto_getters) = false;

option (cosmos_proto.implements_interface) = "*github.com/cosmos/cosmos-sdk/x/bank/legacy/v040.SupplyI";
option (cosmos_proto.implements_interface) = "*github.com/cosmos/cosmos-sdk/x/bank/migrations/v040.SupplyI";

repeated cosmos.base.v1beta1.Coin total = 1
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
Expand Down
2 changes: 1 addition & 1 deletion simapp/params/amino.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package params
import (
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

// MakeTestEncodingConfig creates an EncodingConfig for an amino based test configuration.
Expand Down
2 changes: 1 addition & 1 deletion types/simulation/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

type WeightedProposalContent interface {
Expand Down
2 changes: 1 addition & 1 deletion x/auth/ante/basic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
)

Expand Down
2 changes: 1 addition & 1 deletion x/auth/ante/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion x/auth/ante/sigverify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
"github.com/cosmos/cosmos-sdk/x/auth/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/auth/ante/sigverify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/types"
)

Expand Down
2 changes: 1 addition & 1 deletion x/auth/client/rest/broadcast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/client/tx"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/types/rest"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

// BroadcastReq defines a tx broadcasting request.
Expand Down
2 changes: 1 addition & 1 deletion x/auth/client/rest/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
clienttx "github.com/cosmos/cosmos-sdk/client/tx"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/rest"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
)

Expand Down
2 changes: 1 addition & 1 deletion x/auth/client/rest/encode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
clientrest "github.com/cosmos/cosmos-sdk/client/rest"
"github.com/cosmos/cosmos-sdk/client/tx"
"github.com/cosmos/cosmos-sdk/types/rest"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

// EncodeResp defines a tx encoding response.
Expand Down
2 changes: 1 addition & 1 deletion x/auth/client/rest/rest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
authcli "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
authrest "github.com/cosmos/cosmos-sdk/x/auth/client/rest"
authtest "github.com/cosmos/cosmos-sdk/x/auth/client/testutil"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
bankcli "github.com/cosmos/cosmos-sdk/x/bank/client/testutil"
"github.com/cosmos/cosmos-sdk/x/bank/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/auth/client/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

// GasEstimateResponse defines a response definition for tx gas estimation.
Expand Down
2 changes: 1 addition & 1 deletion x/auth/client/tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
authclient "github.com/cosmos/cosmos-sdk/x/auth/client"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
)

Expand Down
2 changes: 1 addition & 1 deletion x/auth/keeper/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper
import (
"github.com/gogo/protobuf/grpc"

v043 "github.com/cosmos/cosmos-sdk/x/auth/legacy/v043"
v043 "github.com/cosmos/cosmos-sdk/x/auth/migrations/v043"
"github.com/cosmos/cosmos-sdk/x/auth/types"

sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
0 x/auth/legacy/legacytx/amino_signing.go → x/auth/migrations/legacytx/amino_signing.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/legacytx/amino_signing_test.go → ...migrations/legacytx/amino_signing_test.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/legacytx/codec.go → x/auth/migrations/legacytx/codec.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion x/auth/legacy/legacytx/config_test.go → x/auth/migrations/legacytx/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
cryptoAmino "github.com/cosmos/cosmos-sdk/crypto/codec"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/testutil"
)

Expand Down
2 changes: 1 addition & 1 deletion x/auth/legacy/legacytx/stdsig_test.go → x/auth/migrations/legacytx/stdsig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
yaml "gopkg.in/yaml.v2"

"github.com/cosmos/cosmos-sdk/testutil/testdata"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

func TestStdSignatureMarshalYAML(t *testing.T) {
Expand Down
0 x/auth/legacy/legacytx/stdsign.go → x/auth/migrations/legacytx/stdsign.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/legacytx/stdsignmsg.go → x/auth/migrations/legacytx/stdsignmsg.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/legacytx/stdtx.go → x/auth/migrations/legacytx/stdtx.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/legacytx/stdtx_builder.go → x/auth/migrations/legacytx/stdtx_builder.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/legacytx/stdtx_test.go → x/auth/migrations/legacytx/stdtx_test.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/v034/types.go → x/auth/migrations/v034/types.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion x/auth/legacy/v038/types.go → x/auth/migrations/v038/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/bech32/legacybech32"
v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
v034auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v034"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions x/auth/legacy/v039/types.go → x/auth/migrations/v039/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
sdk "github.com/cosmos/cosmos-sdk/types"
v034auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
v038auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v038"
v034auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v034"
v038auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v038"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion x/auth/legacy/v040/migrate.go → x/auth/migrations/v040/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v040
import (
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v039"
v039auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v039"
v040auth "github.com/cosmos/cosmos-sdk/x/auth/types"
v040vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
)
Expand Down
8 changes: 4 additions & 4 deletions x/auth/legacy/v040/migrate_test.go → x/auth/migrations/v040/migrate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
"github.com/cosmos/cosmos-sdk/simapp"
sdk "github.com/cosmos/cosmos-sdk/types"
v034 "github.com/cosmos/cosmos-sdk/x/auth/legacy/v034"
v038auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v038"
v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v039"
v040auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v040"
v034 "github.com/cosmos/cosmos-sdk/x/auth/migrations/v034"
v038auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v038"
v039auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v039"
v040auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v040"
)

func TestMigrate(t *testing.T) {
Expand Down
0 x/auth/legacy/v040/store.go → x/auth/migrations/v040/store.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/v040/types.go → x/auth/migrations/v040/types.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/v043/store.go → x/auth/migrations/v043/store.go
View file
Open in desktop
File renamed without changes.
0 x/auth/legacy/v043/store_test.go → x/auth/migrations/v043/store_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion x/auth/signing/handler_map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
sdk "github.com/cosmos/cosmos-sdk/types"
signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/auth/signing/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
"github.com/cosmos/cosmos-sdk/x/auth/types"
"github.com/cosmos/cosmos-sdk/x/bank/testutil"
Expand Down
2 changes: 1 addition & 1 deletion x/auth/tx/legacy_amino_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
)

Expand Down
2 changes: 1 addition & 1 deletion x/auth/tx/legacy_amino_json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/signing"
)

Expand Down
2 changes: 1 addition & 1 deletion x/auth/types/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/types"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

// RegisterLegacyAminoCodec registers the account interfaces and concrete types on the
Expand Down
2 changes: 1 addition & 1 deletion x/authz/msgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion x/bank/client/rest/tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/errors"
"github.com/cosmos/cosmos-sdk/types/rest"
"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
bankrest "github.com/cosmos/cosmos-sdk/x/bank/client/rest"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
Expand Down
2 changes: 1 addition & 1 deletion x/bank/keeper/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package keeper

import (
sdk "github.com/cosmos/cosmos-sdk/types"
v043 "github.com/cosmos/cosmos-sdk/x/bank/legacy/v043"
v043 "github.com/cosmos/cosmos-sdk/x/bank/migrations/v043"
)

// Migrator is a struct for handling in-place store migrations.
Expand Down
0 x/bank/legacy/v036/types.go → x/bank/migrations/v036/types.go
View file
Open in desktop
File renamed without changes.
0 x/bank/legacy/v038/types.go → x/bank/migrations/v038/types.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion x/bank/legacy/v040/keys.go → x/bank/migrations/v040/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"

sdk "github.com/cosmos/cosmos-sdk/types"
v040auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v040"
v040auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v040"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions x/bank/legacy/v040/migrate.go → x/bank/migrations/v040/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package v040

import (
v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v039"
v036supply "github.com/cosmos/cosmos-sdk/x/bank/legacy/v036"
v038bank "github.com/cosmos/cosmos-sdk/x/bank/legacy/v038"
v039auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v039"
v036supply "github.com/cosmos/cosmos-sdk/x/bank/migrations/v036"
v038bank "github.com/cosmos/cosmos-sdk/x/bank/migrations/v038"
"github.com/cosmos/cosmos-sdk/x/bank/types"
)

Expand Down
10 changes: 5 additions & 5 deletions x/bank/legacy/v040/migrate_test.go → x/bank/migrations/v040/migrate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/simapp"
sdk "github.com/cosmos/cosmos-sdk/types"
v038auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v038"
v039auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v039"
v036supply "github.com/cosmos/cosmos-sdk/x/bank/legacy/v036"
v038bank "github.com/cosmos/cosmos-sdk/x/bank/legacy/v038"
v040bank "github.com/cosmos/cosmos-sdk/x/bank/legacy/v040"
v038auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v038"
v039auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v039"
v036supply "github.com/cosmos/cosmos-sdk/x/bank/migrations/v036"
v038bank "github.com/cosmos/cosmos-sdk/x/bank/migrations/v038"
v040bank "github.com/cosmos/cosmos-sdk/x/bank/migrations/v040"
)

func TestMigrate(t *testing.T) {
Expand Down
0 x/bank/legacy/v040/types.go → x/bank/migrations/v040/types.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions x/bank/legacy/v043/store.go → x/bank/migrations/v043/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/store/prefix"
sdk "github.com/cosmos/cosmos-sdk/types"
v040auth "github.com/cosmos/cosmos-sdk/x/auth/legacy/v040"
v040bank "github.com/cosmos/cosmos-sdk/x/bank/legacy/v040"
v040auth "github.com/cosmos/cosmos-sdk/x/auth/migrations/v040"
v040bank "github.com/cosmos/cosmos-sdk/x/bank/migrations/v040"
"github.com/cosmos/cosmos-sdk/x/bank/types"
)

Expand Down
4 changes: 2 additions & 2 deletions x/bank/legacy/v043/store_test.go → x/bank/migrations/v043/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/cosmos/cosmos-sdk/testutil"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
v040bank "github.com/cosmos/cosmos-sdk/x/bank/legacy/v040"
v043bank "github.com/cosmos/cosmos-sdk/x/bank/legacy/v043"
v040bank "github.com/cosmos/cosmos-sdk/x/bank/migrations/v040"
v043bank "github.com/cosmos/cosmos-sdk/x/bank/migrations/v043"
"github.com/cosmos/cosmos-sdk/x/bank/types"
)

Expand Down
Loading