From 37dc8b2fbb52355d14693412e27a3a42256d13de Mon Sep 17 00:00:00 2001 From: nghuyenthevinh2000 Date: Tue, 9 May 2023 18:43:27 +0700 Subject: [PATCH] apply cherry patch and update tag to v2 --- app/app.go | 24 ++++----- app/encoding.go | 2 +- app/export.go | 2 +- app/keepers/keepers.go | 36 +++++++------- app/keepers/keys.go | 10 ++-- app/keepers/routers.go | 4 +- app/legacy/migrate.go | 4 +- app/legacy/v05/migrate.go | 36 +++++++------- app/modules.go | 52 ++++++++++---------- app/sim_test.go | 6 +-- app/upgrades/types.go | 2 +- app/upgrades/v2/constants.go | 2 +- app/upgrades/v2/upgrades.go | 4 +- app/upgrades/v3/constants.go | 2 +- app/upgrades/v3/upgrades.go | 4 +- cmd/terrad/config.go | 2 +- cmd/terrad/genaccounts.go | 2 +- cmd/terrad/main.go | 2 +- cmd/terrad/root.go | 12 ++--- cmd/terrad/testnet.go | 2 +- custom/auth/ante/ante_test.go | 6 +-- custom/auth/ante/burntax.go | 2 +- custom/auth/ante/burntax_test.go | 6 +-- custom/auth/ante/integration_test.go | 8 +-- custom/auth/ante/min_initial_deposit.go | 2 +- custom/auth/ante/min_initial_deposit_test.go | 2 +- custom/auth/ante/spamming_prevention.go | 2 +- custom/auth/ante/spamming_prevention_test.go | 4 +- custom/auth/ante/tax.go | 8 +-- custom/auth/ante/tax_test.go | 10 ++-- custom/auth/client/cli/estimate_fee.go | 2 +- custom/auth/client/rest/estimate_fee.go | 2 +- custom/auth/client/utils/feeutils.go | 6 +-- custom/auth/legacy/v040/migrate.go | 6 +-- custom/auth/legacy/v040/migrate_test.go | 2 +- custom/auth/module.go | 4 +- custom/auth/simulation/genesis.go | 4 +- custom/auth/tx/service.go | 2 +- custom/authz/client/cli/tx.go | 2 +- custom/authz/legacy/v043/migrate.go | 4 +- custom/authz/legacy/v043/migrate_test.go | 8 +-- custom/authz/module.go | 4 +- custom/bank/client/cli/tx.go | 2 +- custom/bank/client/rest/tx.go | 2 +- custom/bank/module.go | 8 +-- custom/bank/simulation/genesis.go | 2 +- custom/bank/wasm/interface.go | 2 +- custom/bank/wasm/interface_test.go | 2 +- custom/crisis/module.go | 4 +- custom/distribution/module.go | 2 +- custom/distribution/types/codec.go | 2 +- custom/distribution/wasm/interface.go | 2 +- custom/evidence/module.go | 2 +- custom/feegrant/module.go | 2 +- custom/gov/legacy/v043/migrate.go | 2 +- custom/gov/module.go | 4 +- custom/gov/wasm/interface.go | 2 +- custom/mint/module.go | 2 +- custom/params/module.go | 2 +- custom/params/types/codec.go | 2 +- custom/slashing/module.go | 2 +- custom/staking/module.go | 4 +- custom/staking/wasm/interface.go | 2 +- custom/upgrade/module.go | 2 +- custom/upgrade/types/codec.go | 2 +- go.mod | 6 ++- go.sum | 8 ++- types/alias.go | 10 ++-- x/market/abci.go | 2 +- x/market/abci_test.go | 2 +- x/market/client/cli/query.go | 2 +- x/market/client/cli/tx.go | 4 +- x/market/client/rest/query.go | 2 +- x/market/client/rest/tx.go | 4 +- x/market/common_test.go | 4 +- x/market/exported/alias.go | 2 +- x/market/genesis.go | 4 +- x/market/genesis_test.go | 2 +- x/market/handler.go | 4 +- x/market/handler_test.go | 6 +-- x/market/keeper/alias_functions.go | 2 +- x/market/keeper/keeper.go | 2 +- x/market/keeper/keeper_test.go | 2 +- x/market/keeper/legacy_querier.go | 2 +- x/market/keeper/legacy_querier_test.go | 4 +- x/market/keeper/msg_server.go | 6 +-- x/market/keeper/params.go | 2 +- x/market/keeper/querier.go | 2 +- x/market/keeper/querier_test.go | 4 +- x/market/keeper/swap.go | 4 +- x/market/keeper/swap_test.go | 2 +- x/market/keeper/test_utils.go | 20 ++++---- x/market/legacy/v05/migrate.go | 4 +- x/market/legacy/v05/migrate_test.go | 8 +-- x/market/module.go | 10 ++-- x/market/simulation/decoder.go | 2 +- x/market/simulation/decoder_test.go | 4 +- x/market/simulation/genesis.go | 2 +- x/market/simulation/operations.go | 4 +- x/market/simulation/params.go | 2 +- x/market/types/msgs_test.go | 2 +- x/market/types/params.go | 2 +- x/market/wasm/interface.go | 6 +-- x/market/wasm/interface_test.go | 6 +-- x/oracle/abci.go | 6 +-- x/oracle/abci_test.go | 8 +-- x/oracle/client/cli/query.go | 2 +- x/oracle/client/cli/tx.go | 2 +- x/oracle/client/rest/query.go | 2 +- x/oracle/client/rest/tx.go | 2 +- x/oracle/common_test.go | 4 +- x/oracle/exported/alias.go | 2 +- x/oracle/genesis.go | 4 +- x/oracle/genesis_test.go | 6 +-- x/oracle/handler.go | 4 +- x/oracle/handler_test.go | 6 +-- x/oracle/keeper/alias_functions.go | 2 +- x/oracle/keeper/ballot.go | 2 +- x/oracle/keeper/ballot_test.go | 4 +- x/oracle/keeper/keeper.go | 4 +- x/oracle/keeper/keeper_test.go | 4 +- x/oracle/keeper/legacy_querier.go | 2 +- x/oracle/keeper/legacy_querier_test.go | 4 +- x/oracle/keeper/msg_server.go | 2 +- x/oracle/keeper/msg_server_test.go | 4 +- x/oracle/keeper/params.go | 2 +- x/oracle/keeper/querier.go | 2 +- x/oracle/keeper/querier_test.go | 4 +- x/oracle/keeper/reward.go | 4 +- x/oracle/keeper/reward_test.go | 4 +- x/oracle/keeper/test_utils.go | 14 +++--- x/oracle/legacy/v05/migrate.go | 4 +- x/oracle/legacy/v05/migrate_test.go | 8 +-- x/oracle/module.go | 10 ++-- x/oracle/simulation/decoder.go | 2 +- x/oracle/simulation/decoder_test.go | 8 +-- x/oracle/simulation/genesis.go | 4 +- x/oracle/simulation/operations.go | 6 +-- x/oracle/simulation/params.go | 2 +- x/oracle/tally.go | 6 +-- x/oracle/tally_fuzz_test.go | 4 +- x/oracle/types/ballot_test.go | 4 +- x/oracle/types/denom_test.go | 2 +- x/oracle/types/genesis_test.go | 4 +- x/oracle/types/hash_test.go | 2 +- x/oracle/types/msgs_test.go | 4 +- x/oracle/types/params.go | 2 +- x/oracle/types/params_test.go | 2 +- x/oracle/types/vote_test.go | 2 +- x/oracle/wasm/interface.go | 4 +- x/oracle/wasm/interface_test.go | 6 +-- x/treasury/abci.go | 6 +-- x/treasury/abci_test.go | 6 +-- x/treasury/client/cli/gov_tx.go | 2 +- x/treasury/client/cli/query.go | 2 +- x/treasury/client/proposal_handler.go | 2 +- x/treasury/client/rest/query.go | 2 +- x/treasury/exported/alias.go | 2 +- x/treasury/genesis.go | 6 +-- x/treasury/genesis_test.go | 4 +- x/treasury/keeper/alias_functions.go | 2 +- x/treasury/keeper/burn_account.go | 2 +- x/treasury/keeper/burn_account_test.go | 2 +- x/treasury/keeper/gov.go | 2 +- x/treasury/keeper/indicator.go | 2 +- x/treasury/keeper/indicator_test.go | 2 +- x/treasury/keeper/keeper.go | 4 +- x/treasury/keeper/keeper_test.go | 4 +- x/treasury/keeper/legacy_querier.go | 4 +- x/treasury/keeper/legacy_querier_test.go | 6 +-- x/treasury/keeper/migrations.go | 2 +- x/treasury/keeper/params.go | 2 +- x/treasury/keeper/policy_test.go | 6 +-- x/treasury/keeper/querier.go | 4 +- x/treasury/keeper/querier_test.go | 4 +- x/treasury/keeper/seigniorage.go | 4 +- x/treasury/keeper/seigniorage_test.go | 2 +- x/treasury/keeper/test_utils.go | 26 +++++----- x/treasury/legacy/v05/migrate.go | 4 +- x/treasury/legacy/v05/migrate_test.go | 8 +-- x/treasury/module.go | 10 ++-- x/treasury/proposal_handler.go | 4 +- x/treasury/simulation/decoder.go | 2 +- x/treasury/simulation/decoder_test.go | 6 +-- x/treasury/simulation/genesis.go | 4 +- x/treasury/simulation/params.go | 2 +- x/treasury/types/exptected_keepers.go | 2 +- x/treasury/types/params.go | 2 +- x/treasury/wasm/interface.go | 6 +-- x/treasury/wasm/interface_test.go | 6 +-- x/vesting/module.go | 2 +- x/vesting/types/common_test.go | 4 +- x/vesting/types/genesis_test.go | 4 +- x/vesting/types/vesting_account_test.go | 4 +- x/wasm/client/cli/query.go | 2 +- x/wasm/client/cli/tx.go | 6 +-- x/wasm/client/rest/query.go | 2 +- x/wasm/client/rest/tx.go | 6 +-- x/wasm/common_test.go | 2 +- x/wasm/exported/alias.go | 2 +- x/wasm/genesis.go | 4 +- x/wasm/genesis_test.go | 10 ++-- x/wasm/handler.go | 4 +- x/wasm/handler_test.go | 10 ++-- x/wasm/keeper/api.go | 2 +- x/wasm/keeper/bench_test.go | 8 +-- x/wasm/keeper/connector.go | 4 +- x/wasm/keeper/contract.go | 2 +- x/wasm/keeper/contract_test.go | 6 +-- x/wasm/keeper/custom_test.go | 12 ++--- x/wasm/keeper/ioutil.go | 2 +- x/wasm/keeper/ioutil_test.go | 4 +- x/wasm/keeper/keeper.go | 4 +- x/wasm/keeper/keeper_test.go | 4 +- x/wasm/keeper/legacy_querier.go | 2 +- x/wasm/keeper/legacy_querier_test.go | 4 +- x/wasm/keeper/msg_server.go | 2 +- x/wasm/keeper/msg_server_test.go | 6 +-- x/wasm/keeper/params.go | 2 +- x/wasm/keeper/querier.go | 2 +- x/wasm/keeper/querier_test.go | 4 +- x/wasm/keeper/recursive_test.go | 8 +-- x/wasm/keeper/reflect_test.go | 4 +- x/wasm/keeper/staking_test.go | 4 +- x/wasm/keeper/submsg_test.go | 8 +-- x/wasm/keeper/test_utils.go | 46 ++++++++--------- x/wasm/keeper/wasm_interface.go | 2 +- x/wasm/keeper/wasm_interface_stargate.go | 2 +- x/wasm/keeper/wasm_interface_test.go | 6 +-- x/wasm/legacy/v05/migrate.go | 4 +- x/wasm/legacy/v05/migrate_test.go | 8 +-- x/wasm/module.go | 10 ++-- x/wasm/simulation/decoder.go | 2 +- x/wasm/simulation/decoder_test.go | 4 +- x/wasm/simulation/genesis.go | 2 +- x/wasm/simulation/operations.go | 6 +-- x/wasm/simulation/params.go | 2 +- 237 files changed, 570 insertions(+), 570 deletions(-) diff --git a/app/app.go b/app/app.go index 555dae25c..4386e10bc 100644 --- a/app/app.go +++ b/app/app.go @@ -41,23 +41,23 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/classic-terra/core/app/keepers" - terraappparams "github.com/classic-terra/core/app/params" + "github.com/classic-terra/core/v2/app/keepers" + terraappparams "github.com/classic-terra/core/v2/app/params" // upgrades - "github.com/classic-terra/core/app/upgrades" - v2 "github.com/classic-terra/core/app/upgrades/v2" - v3 "github.com/classic-terra/core/app/upgrades/v3" + "github.com/classic-terra/core/v2/app/upgrades" + v2 "github.com/classic-terra/core/v2/app/upgrades/v2" + v3 "github.com/classic-terra/core/v2/app/upgrades/v3" - customante "github.com/classic-terra/core/custom/auth/ante" - customauthrest "github.com/classic-terra/core/custom/auth/client/rest" - customauthtx "github.com/classic-terra/core/custom/auth/tx" - core "github.com/classic-terra/core/types" + customante "github.com/classic-terra/core/v2/custom/auth/ante" + customauthrest "github.com/classic-terra/core/v2/custom/auth/client/rest" + customauthtx "github.com/classic-terra/core/v2/custom/auth/tx" + core "github.com/classic-terra/core/v2/types" - wasmconfig "github.com/classic-terra/core/x/wasm/config" + wasmconfig "github.com/classic-terra/core/v2/x/wasm/config" // unnamed import of statik for swagger UI support - _ "github.com/classic-terra/core/client/docs/statik" + _ "github.com/classic-terra/core/v2/client/docs/statik" ) const appName = "TerraApp" @@ -285,7 +285,7 @@ func (app *TerraApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abc panic(err) } if ctx.ChainID() == core.ColumbusChainID { - panic("Must use v1.0.x for importing the columbus genesis (https://github.com/classic-terra/core/releases/)") + panic("Must use v1.0.x for importing the columbus genesis (https://github.com/classic-terra/core/v2/releases/)") } app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()) return app.mm.InitGenesis(ctx, app.appCodec, genesisState) diff --git a/app/encoding.go b/app/encoding.go index b2912408a..4b9220a19 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec/legacy" "github.com/cosmos/cosmos-sdk/std" - "github.com/classic-terra/core/app/params" + "github.com/classic-terra/core/v2/app/params" ) var legacyCodecRegistered = false diff --git a/app/export.go b/app/export.go index c9add528c..df4a3686f 100644 --- a/app/export.go +++ b/app/export.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - oracletypes "github.com/classic-terra/core/x/oracle/types" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" ) // ExportAppStateAndValidators exports the state of the application for a genesis diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index c7971a377..3e25e191b 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -38,26 +38,26 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - marketkeeper "github.com/classic-terra/core/x/market/keeper" - markettypes "github.com/classic-terra/core/x/market/types" - oraclekeeper "github.com/classic-terra/core/x/oracle/keeper" - oracletypes "github.com/classic-terra/core/x/oracle/types" - treasurykeeper "github.com/classic-terra/core/x/treasury/keeper" - treasurytypes "github.com/classic-terra/core/x/treasury/types" - wasmconfig "github.com/classic-terra/core/x/wasm/config" - wasmkeeper "github.com/classic-terra/core/x/wasm/keeper" - wasmtypes "github.com/classic-terra/core/x/wasm/types" - - bankwasm "github.com/classic-terra/core/custom/bank/wasm" - distrwasm "github.com/classic-terra/core/custom/distribution/wasm" - govwasm "github.com/classic-terra/core/custom/gov/wasm" - stakingwasm "github.com/classic-terra/core/custom/staking/wasm" - marketwasm "github.com/classic-terra/core/x/market/wasm" - oraclewasm "github.com/classic-terra/core/x/oracle/wasm" - treasurywasm "github.com/classic-terra/core/x/treasury/wasm" + marketkeeper "github.com/classic-terra/core/v2/x/market/keeper" + markettypes "github.com/classic-terra/core/v2/x/market/types" + oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + treasurykeeper "github.com/classic-terra/core/v2/x/treasury/keeper" + treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + wasmconfig "github.com/classic-terra/core/v2/x/wasm/config" + wasmkeeper "github.com/classic-terra/core/v2/x/wasm/keeper" + wasmtypes "github.com/classic-terra/core/v2/x/wasm/types" + + bankwasm "github.com/classic-terra/core/v2/custom/bank/wasm" + distrwasm "github.com/classic-terra/core/v2/custom/distribution/wasm" + govwasm "github.com/classic-terra/core/v2/custom/gov/wasm" + stakingwasm "github.com/classic-terra/core/v2/custom/staking/wasm" + marketwasm "github.com/classic-terra/core/v2/x/market/wasm" + oraclewasm "github.com/classic-terra/core/v2/x/oracle/wasm" + treasurywasm "github.com/classic-terra/core/v2/x/treasury/wasm" // unnamed import of statik for swagger UI support - _ "github.com/classic-terra/core/client/docs/statik" + _ "github.com/classic-terra/core/v2/client/docs/statik" ) type AppKeepers struct { diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 3370ad862..6fcaa3c88 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -20,13 +20,13 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - markettypes "github.com/classic-terra/core/x/market/types" - oracletypes "github.com/classic-terra/core/x/oracle/types" - treasurytypes "github.com/classic-terra/core/x/treasury/types" - wasmtypes "github.com/classic-terra/core/x/wasm/types" + markettypes "github.com/classic-terra/core/v2/x/market/types" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + wasmtypes "github.com/classic-terra/core/v2/x/wasm/types" // unnamed import of statik for swagger UI support - _ "github.com/classic-terra/core/client/docs/statik" + _ "github.com/classic-terra/core/v2/client/docs/statik" ) func (appKeepers *AppKeepers) GenerateKeys() { diff --git a/app/keepers/routers.go b/app/keepers/routers.go index 519ca8fa9..fe6d2c4a4 100644 --- a/app/keepers/routers.go +++ b/app/keepers/routers.go @@ -7,8 +7,8 @@ import ( ibcclienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types" porttypes "github.com/cosmos/ibc-go/modules/core/05-port/types" - "github.com/classic-terra/core/x/treasury" - treasurytypes "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury" + treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" distr "github.com/cosmos/cosmos-sdk/x/distribution" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" diff --git a/app/legacy/migrate.go b/app/legacy/migrate.go index 361fbaf0e..8e8fa290b 100644 --- a/app/legacy/migrate.go +++ b/app/legacy/migrate.go @@ -26,8 +26,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil/types" staking "github.com/cosmos/cosmos-sdk/x/staking/types" - legacy05 "github.com/classic-terra/core/app/legacy/v05" - oracletypes "github.com/classic-terra/core/x/oracle/types" + legacy05 "github.com/classic-terra/core/v2/app/legacy/v05" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" ) const ( diff --git a/app/legacy/v05/migrate.go b/app/legacy/v05/migrate.go index db0ae197e..c09601538 100644 --- a/app/legacy/v05/migrate.go +++ b/app/legacy/v05/migrate.go @@ -27,24 +27,24 @@ import ( v038staking "github.com/cosmos/cosmos-sdk/x/staking/legacy/v038" v040staking "github.com/cosmos/cosmos-sdk/x/staking/legacy/v040" - v039authcustom "github.com/classic-terra/core/custom/auth/legacy/v039" - v040authcustom "github.com/classic-terra/core/custom/auth/legacy/v040" - v036distrcustom "github.com/classic-terra/core/custom/distribution/legacy/v036" - v036govcustom "github.com/classic-terra/core/custom/gov/legacy/v036" - v043govcustom "github.com/classic-terra/core/custom/gov/legacy/v043" - v036paramscustom "github.com/classic-terra/core/custom/params/legacy/v036" - v038upgradecustom "github.com/classic-terra/core/custom/upgrade/legacy/v038" - - v043authz "github.com/classic-terra/core/custom/authz/legacy/v043" - v04market "github.com/classic-terra/core/x/market/legacy/v04" - v05market "github.com/classic-terra/core/x/market/legacy/v05" - v04msgauth "github.com/classic-terra/core/x/msgauth/legacy/v04" - v04oracle "github.com/classic-terra/core/x/oracle/legacy/v04" - v05oracle "github.com/classic-terra/core/x/oracle/legacy/v05" - v04treasury "github.com/classic-terra/core/x/treasury/legacy/v04" - v05treasury "github.com/classic-terra/core/x/treasury/legacy/v05" - v04wasm "github.com/classic-terra/core/x/wasm/legacy/v04" - v05wasm "github.com/classic-terra/core/x/wasm/legacy/v05" + v039authcustom "github.com/classic-terra/core/v2/custom/auth/legacy/v039" + v040authcustom "github.com/classic-terra/core/v2/custom/auth/legacy/v040" + v036distrcustom "github.com/classic-terra/core/v2/custom/distribution/legacy/v036" + v036govcustom "github.com/classic-terra/core/v2/custom/gov/legacy/v036" + v043govcustom "github.com/classic-terra/core/v2/custom/gov/legacy/v043" + v036paramscustom "github.com/classic-terra/core/v2/custom/params/legacy/v036" + v038upgradecustom "github.com/classic-terra/core/v2/custom/upgrade/legacy/v038" + + v043authz "github.com/classic-terra/core/v2/custom/authz/legacy/v043" + v04market "github.com/classic-terra/core/v2/x/market/legacy/v04" + v05market "github.com/classic-terra/core/v2/x/market/legacy/v05" + v04msgauth "github.com/classic-terra/core/v2/x/msgauth/legacy/v04" + v04oracle "github.com/classic-terra/core/v2/x/oracle/legacy/v04" + v05oracle "github.com/classic-terra/core/v2/x/oracle/legacy/v05" + v04treasury "github.com/classic-terra/core/v2/x/treasury/legacy/v04" + v05treasury "github.com/classic-terra/core/v2/x/treasury/legacy/v05" + v04wasm "github.com/classic-terra/core/v2/x/wasm/legacy/v04" + v05wasm "github.com/classic-terra/core/v2/x/wasm/legacy/v05" ) func migrateGenutil(oldGenState v039genutil.GenesisState) *types.GenesisState { diff --git a/app/modules.go b/app/modules.go index af8ca5e91..dfb9740ad 100644 --- a/app/modules.go +++ b/app/modules.go @@ -42,36 +42,36 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - terraappparams "github.com/classic-terra/core/app/params" + terraappparams "github.com/classic-terra/core/v2/app/params" - customauth "github.com/classic-terra/core/custom/auth" - customauthsim "github.com/classic-terra/core/custom/auth/simulation" - customauthz "github.com/classic-terra/core/custom/authz" - custombank "github.com/classic-terra/core/custom/bank" - customcrisis "github.com/classic-terra/core/custom/crisis" - customdistr "github.com/classic-terra/core/custom/distribution" - customevidence "github.com/classic-terra/core/custom/evidence" - customfeegrant "github.com/classic-terra/core/custom/feegrant" - customgov "github.com/classic-terra/core/custom/gov" - custommint "github.com/classic-terra/core/custom/mint" - customparams "github.com/classic-terra/core/custom/params" - customslashing "github.com/classic-terra/core/custom/slashing" - customstaking "github.com/classic-terra/core/custom/staking" - customupgrade "github.com/classic-terra/core/custom/upgrade" + customauth "github.com/classic-terra/core/v2/custom/auth" + customauthsim "github.com/classic-terra/core/v2/custom/auth/simulation" + customauthz "github.com/classic-terra/core/v2/custom/authz" + custombank "github.com/classic-terra/core/v2/custom/bank" + customcrisis "github.com/classic-terra/core/v2/custom/crisis" + customdistr "github.com/classic-terra/core/v2/custom/distribution" + customevidence "github.com/classic-terra/core/v2/custom/evidence" + customfeegrant "github.com/classic-terra/core/v2/custom/feegrant" + customgov "github.com/classic-terra/core/v2/custom/gov" + custommint "github.com/classic-terra/core/v2/custom/mint" + customparams "github.com/classic-terra/core/v2/custom/params" + customslashing "github.com/classic-terra/core/v2/custom/slashing" + customstaking "github.com/classic-terra/core/v2/custom/staking" + customupgrade "github.com/classic-terra/core/v2/custom/upgrade" - "github.com/classic-terra/core/x/market" - markettypes "github.com/classic-terra/core/x/market/types" - "github.com/classic-terra/core/x/oracle" - oracletypes "github.com/classic-terra/core/x/oracle/types" - "github.com/classic-terra/core/x/treasury" - treasuryclient "github.com/classic-terra/core/x/treasury/client" - treasurytypes "github.com/classic-terra/core/x/treasury/types" - "github.com/classic-terra/core/x/vesting" - "github.com/classic-terra/core/x/wasm" - wasmtypes "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/market" + markettypes "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v2/x/oracle" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v2/x/treasury" + treasuryclient "github.com/classic-terra/core/v2/x/treasury/client" + treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + "github.com/classic-terra/core/v2/x/vesting" + "github.com/classic-terra/core/v2/x/wasm" + wasmtypes "github.com/classic-terra/core/v2/x/wasm/types" // unnamed import of statik for swagger UI support - _ "github.com/classic-terra/core/client/docs/statik" + _ "github.com/classic-terra/core/v2/client/docs/statik" ) var ( diff --git a/app/sim_test.go b/app/sim_test.go index d75aee755..fb0e994b7 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - terraapp "github.com/classic-terra/core/app" - "github.com/classic-terra/core/app/helpers" - wasmconfig "github.com/classic-terra/core/x/wasm/config" + terraapp "github.com/classic-terra/core/v2/app" + "github.com/classic-terra/core/v2/app/helpers" + wasmconfig "github.com/classic-terra/core/v2/x/wasm/config" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/log" diff --git a/app/upgrades/types.go b/app/upgrades/types.go index a81a82411..fffa87ddf 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -7,7 +7,7 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/classic-terra/core/app/keepers" + "github.com/classic-terra/core/v2/app/keepers" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil diff --git a/app/upgrades/v2/constants.go b/app/upgrades/v2/constants.go index f22bf510a..35be5dd93 100644 --- a/app/upgrades/v2/constants.go +++ b/app/upgrades/v2/constants.go @@ -1,7 +1,7 @@ package v2 import ( - "github.com/classic-terra/core/app/upgrades" + "github.com/classic-terra/core/v2/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v2/upgrades.go b/app/upgrades/v2/upgrades.go index 292fde341..81a8cb268 100644 --- a/app/upgrades/v2/upgrades.go +++ b/app/upgrades/v2/upgrades.go @@ -1,8 +1,8 @@ package v2 import ( - "github.com/classic-terra/core/app/keepers" - "github.com/classic-terra/core/app/upgrades" + "github.com/classic-terra/core/v2/app/keepers" + "github.com/classic-terra/core/v2/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v3/constants.go b/app/upgrades/v3/constants.go index c49b23324..772869b31 100644 --- a/app/upgrades/v3/constants.go +++ b/app/upgrades/v3/constants.go @@ -1,7 +1,7 @@ package v3 import ( - "github.com/classic-terra/core/app/upgrades" + "github.com/classic-terra/core/v2/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go index 04fceebb8..f3db6acd5 100644 --- a/app/upgrades/v3/upgrades.go +++ b/app/upgrades/v3/upgrades.go @@ -1,8 +1,8 @@ package v3 import ( - "github.com/classic-terra/core/app/keepers" - "github.com/classic-terra/core/app/upgrades" + "github.com/classic-terra/core/v2/app/keepers" + "github.com/classic-terra/core/v2/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/cmd/terrad/config.go b/cmd/terrad/config.go index ff1b5d9a0..6b287565c 100644 --- a/cmd/terrad/config.go +++ b/cmd/terrad/config.go @@ -1,7 +1,7 @@ package main import ( - wasmconfig "github.com/classic-terra/core/x/wasm/config" + wasmconfig "github.com/classic-terra/core/v2/x/wasm/config" serverconfig "github.com/cosmos/cosmos-sdk/server/config" ) diff --git a/cmd/terrad/genaccounts.go b/cmd/terrad/genaccounts.go index c7a2dc25c..17be623d8 100644 --- a/cmd/terrad/genaccounts.go +++ b/cmd/terrad/genaccounts.go @@ -21,7 +21,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - vestingtypes "github.com/classic-terra/core/x/vesting/types" + vestingtypes "github.com/classic-terra/core/v2/x/vesting/types" ) const ( diff --git a/cmd/terrad/main.go b/cmd/terrad/main.go index c2d327660..b52c21d2c 100644 --- a/cmd/terrad/main.go +++ b/cmd/terrad/main.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - terraapp "github.com/classic-terra/core/app" + terraapp "github.com/classic-terra/core/v2/app" ) func main() { diff --git a/cmd/terrad/root.go b/cmd/terrad/root.go index a1647a819..5b82b8946 100644 --- a/cmd/terrad/root.go +++ b/cmd/terrad/root.go @@ -30,12 +30,12 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - terraapp "github.com/classic-terra/core/app" - terralegacy "github.com/classic-terra/core/app/legacy" - "github.com/classic-terra/core/app/params" - authcustomcli "github.com/classic-terra/core/custom/auth/client/cli" - core "github.com/classic-terra/core/types" - wasmconfig "github.com/classic-terra/core/x/wasm/config" + terraapp "github.com/classic-terra/core/v2/app" + terralegacy "github.com/classic-terra/core/v2/app/legacy" + "github.com/classic-terra/core/v2/app/params" + authcustomcli "github.com/classic-terra/core/v2/custom/auth/client/cli" + core "github.com/classic-terra/core/v2/types" + wasmconfig "github.com/classic-terra/core/v2/x/wasm/config" ) // NewRootCmd creates a new root command for terrad. It is called once in the diff --git a/cmd/terrad/testnet.go b/cmd/terrad/testnet.go index d09756b6b..426f0a63d 100644 --- a/cmd/terrad/testnet.go +++ b/cmd/terrad/testnet.go @@ -36,7 +36,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" ) var ( diff --git a/custom/auth/ante/ante_test.go b/custom/auth/ante/ante_test.go index 52146a14c..5677e5b5b 100644 --- a/custom/auth/ante/ante_test.go +++ b/custom/auth/ante/ante_test.go @@ -24,9 +24,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - terraapp "github.com/classic-terra/core/app" - treasurytypes "github.com/classic-terra/core/x/treasury/types" - wasmconfig "github.com/classic-terra/core/x/wasm/config" + terraapp "github.com/classic-terra/core/v2/app" + treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + wasmconfig "github.com/classic-terra/core/v2/x/wasm/config" ) // AnteTestSuite is a test suite to be used with ante handler tests. diff --git a/custom/auth/ante/burntax.go b/custom/auth/ante/burntax.go index 869541790..a511bd6b9 100644 --- a/custom/auth/ante/burntax.go +++ b/custom/auth/ante/burntax.go @@ -1,7 +1,7 @@ package ante import ( - treasury "github.com/classic-terra/core/x/treasury/types" + treasury "github.com/classic-terra/core/v2/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" cosmosante "github.com/cosmos/cosmos-sdk/x/auth/ante" diff --git a/custom/auth/ante/burntax_test.go b/custom/auth/ante/burntax_test.go index 8865e1482..cb9cd8b72 100644 --- a/custom/auth/ante/burntax_test.go +++ b/custom/auth/ante/burntax_test.go @@ -8,14 +8,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/classic-terra/core/custom/auth/ante" - core "github.com/classic-terra/core/types" + "github.com/classic-terra/core/v2/custom/auth/ante" + core "github.com/classic-terra/core/v2/types" "github.com/cosmos/cosmos-sdk/types/query" "github.com/cosmos/cosmos-sdk/x/auth/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" ) -// go test -v -run ^TestAnteTestSuite/TestSplitTax$ github.com/classic-terra/core/custom/auth/ante +// go test -v -run ^TestAnteTestSuite/TestSplitTax$ github.com/classic-terra/core/v2/custom/auth/ante func (suite *AnteTestSuite) TestSplitTax() { suite.runSplitTaxTest(sdk.NewDecWithPrec(1, 0)) // 100% suite.runSplitTaxTest(sdk.NewDecWithPrec(1, 1)) // 10% diff --git a/custom/auth/ante/integration_test.go b/custom/auth/ante/integration_test.go index c73e43896..b72fc8c20 100644 --- a/custom/auth/ante/integration_test.go +++ b/custom/auth/ante/integration_test.go @@ -3,9 +3,9 @@ package ante_test import ( "fmt" - customante "github.com/classic-terra/core/custom/auth/ante" - core "github.com/classic-terra/core/types" - treasurytypes "github.com/classic-terra/core/x/treasury/types" + customante "github.com/classic-terra/core/v2/custom/auth/ante" + core "github.com/classic-terra/core/v2/types" + treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" @@ -14,7 +14,7 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" ) -// go test -v -run ^TestAnteTestSuite/TestIntegrationTaxExemption$ github.com/classic-terra/core/custom/auth/ante +// go test -v -run ^TestAnteTestSuite/TestIntegrationTaxExemption$ github.com/classic-terra/core/v2/custom/auth/ante func (suite *AnteTestSuite) TestIntegrationTaxExemption() { // keys and addresses var privs []cryptotypes.PrivKey diff --git a/custom/auth/ante/min_initial_deposit.go b/custom/auth/ante/min_initial_deposit.go index c47f9c3d9..893fdf508 100644 --- a/custom/auth/ante/min_initial_deposit.go +++ b/custom/auth/ante/min_initial_deposit.go @@ -3,7 +3,7 @@ package ante import ( "fmt" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" diff --git a/custom/auth/ante/min_initial_deposit_test.go b/custom/auth/ante/min_initial_deposit_test.go index 6b674c7c3..9158c7573 100644 --- a/custom/auth/ante/min_initial_deposit_test.go +++ b/custom/auth/ante/min_initial_deposit_test.go @@ -9,7 +9,7 @@ import ( // banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/classic-terra/core/custom/auth/ante" + "github.com/classic-terra/core/v2/custom/auth/ante" // core "github.com/terra-money/core/types" // treasury "github.com/terra-money/core/x/treasury/types" diff --git a/custom/auth/ante/spamming_prevention.go b/custom/auth/ante/spamming_prevention.go index 3a847f6d5..ea954bdee 100644 --- a/custom/auth/ante/spamming_prevention.go +++ b/custom/auth/ante/spamming_prevention.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - oracleexported "github.com/classic-terra/core/x/oracle/exported" + oracleexported "github.com/classic-terra/core/v2/x/oracle/exported" ) // SpammingPreventionDecorator will check if the transaction's gas is smaller than diff --git a/custom/auth/ante/spamming_prevention_test.go b/custom/auth/ante/spamming_prevention_test.go index 48fcd48d5..9e0063e5d 100644 --- a/custom/auth/ante/spamming_prevention_test.go +++ b/custom/auth/ante/spamming_prevention_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/classic-terra/core/custom/auth/ante" - oracletypes "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/custom/auth/ante" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" ) func (suite *AnteTestSuite) TestOracleSpamming() { diff --git a/custom/auth/ante/tax.go b/custom/auth/ante/tax.go index 942366162..36a7e66fc 100644 --- a/custom/auth/ante/tax.go +++ b/custom/auth/ante/tax.go @@ -8,10 +8,10 @@ import ( authz "github.com/cosmos/cosmos-sdk/x/authz" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - core "github.com/classic-terra/core/types" - marketexported "github.com/classic-terra/core/x/market/exported" - oracleexported "github.com/classic-terra/core/x/oracle/exported" - wasmexported "github.com/classic-terra/core/x/wasm/exported" + core "github.com/classic-terra/core/v2/types" + marketexported "github.com/classic-terra/core/v2/x/market/exported" + oracleexported "github.com/classic-terra/core/v2/x/oracle/exported" + wasmexported "github.com/classic-terra/core/v2/x/wasm/exported" ) // MaxOracleMsgGasUsage is constant expected oracle msg gas cost diff --git a/custom/auth/ante/tax_test.go b/custom/auth/ante/tax_test.go index c81025f11..f0f56693a 100644 --- a/custom/auth/ante/tax_test.go +++ b/custom/auth/ante/tax_test.go @@ -12,10 +12,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/classic-terra/core/custom/auth/ante" - core "github.com/classic-terra/core/types" - markettypes "github.com/classic-terra/core/x/market/types" - wasmtypes "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/custom/auth/ante" + core "github.com/classic-terra/core/v2/types" + markettypes "github.com/classic-terra/core/v2/x/market/types" + wasmtypes "github.com/classic-terra/core/v2/x/wasm/types" ) func (suite *AnteTestSuite) TestEnsureMempoolFeesGas() { @@ -746,7 +746,7 @@ func (suite *AnteTestSuite) TestEnsureMempoolFeesExecLunaTax() { suite.Require().NoError(err, "Decorator should not have errored on fee higher than local gasPrice") } -// go test -v -run ^TestAnteTestSuite/TestTaxExemption$ github.com/classic-terra/core/custom/auth/ante +// go test -v -run ^TestAnteTestSuite/TestTaxExemption$ github.com/classic-terra/core/v2/custom/auth/ante func (suite *AnteTestSuite) TestTaxExemption() { // keys and addresses var privs []cryptotypes.PrivKey diff --git a/custom/auth/client/cli/estimate_fee.go b/custom/auth/client/cli/estimate_fee.go index e5bc1e74e..aa0666934 100644 --- a/custom/auth/client/cli/estimate_fee.go +++ b/custom/auth/client/cli/estimate_fee.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" authclient "github.com/cosmos/cosmos-sdk/x/auth/client" - feeutils "github.com/classic-terra/core/custom/auth/client/utils" + feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" ) // GetTxFeesEstimateCommand will create a send tx and sign it with the given key. diff --git a/custom/auth/client/rest/estimate_fee.go b/custom/auth/client/rest/estimate_fee.go index 821484cf5..f48d8d1a8 100644 --- a/custom/auth/client/rest/estimate_fee.go +++ b/custom/auth/client/rest/estimate_fee.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/types/rest" - feeutils "github.com/classic-terra/core/custom/auth/client/utils" + feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" ) // EstimateTxFeeRequestHandlerFn returns estimated tx fee. In particular, diff --git a/custom/auth/client/utils/feeutils.go b/custom/auth/client/utils/feeutils.go index 750001883..37e44cdf6 100644 --- a/custom/auth/client/utils/feeutils.go +++ b/custom/auth/client/utils/feeutils.go @@ -17,9 +17,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - marketexported "github.com/classic-terra/core/x/market/exported" - treasuryexported "github.com/classic-terra/core/x/treasury/exported" - wasmexported "github.com/classic-terra/core/x/wasm/exported" + marketexported "github.com/classic-terra/core/v2/x/market/exported" + treasuryexported "github.com/classic-terra/core/v2/x/treasury/exported" + wasmexported "github.com/classic-terra/core/v2/x/wasm/exported" ) type ( diff --git a/custom/auth/legacy/v040/migrate.go b/custom/auth/legacy/v040/migrate.go index 31efb3f84..ed3d2b295 100644 --- a/custom/auth/legacy/v040/migrate.go +++ b/custom/auth/legacy/v040/migrate.go @@ -11,9 +11,9 @@ import ( v040authvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" v40mint "github.com/cosmos/cosmos-sdk/x/mint/types" - v039authcustom "github.com/classic-terra/core/custom/auth/legacy/v039" - v40treasury "github.com/classic-terra/core/x/treasury/types" - v040vesting "github.com/classic-terra/core/x/vesting/types" + v039authcustom "github.com/classic-terra/core/v2/custom/auth/legacy/v039" + v40treasury "github.com/classic-terra/core/v2/x/treasury/types" + v040vesting "github.com/classic-terra/core/v2/x/vesting/types" ) // convertBaseAccount converts a 0.39 BaseAccount to a 0.40 BaseAccount. diff --git a/custom/auth/legacy/v040/migrate_test.go b/custom/auth/legacy/v040/migrate_test.go index ee9fce827..fc2030cfc 100644 --- a/custom/auth/legacy/v040/migrate_test.go +++ b/custom/auth/legacy/v040/migrate_test.go @@ -3,7 +3,7 @@ package v040 import ( "testing" - v039authcustom "github.com/classic-terra/core/custom/auth/legacy/v039" + v039authcustom "github.com/classic-terra/core/v2/custom/auth/legacy/v039" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/codec" diff --git a/custom/auth/module.go b/custom/auth/module.go index e77a4cfc5..439c9181b 100644 --- a/custom/auth/module.go +++ b/custom/auth/module.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/keeper" "github.com/cosmos/cosmos-sdk/x/auth/types" - customsim "github.com/classic-terra/core/custom/auth/simulation" - customtypes "github.com/classic-terra/core/custom/auth/types" + customsim "github.com/classic-terra/core/v2/custom/auth/simulation" + customtypes "github.com/classic-terra/core/v2/custom/auth/types" ) var ( diff --git a/custom/auth/simulation/genesis.go b/custom/auth/simulation/genesis.go index 9bcd731c1..73f50d799 100644 --- a/custom/auth/simulation/genesis.go +++ b/custom/auth/simulation/genesis.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/auth/types" - core "github.com/classic-terra/core/types" - customvestingtypes "github.com/classic-terra/core/x/vesting/types" + core "github.com/classic-terra/core/v2/types" + customvestingtypes "github.com/classic-terra/core/v2/x/vesting/types" ) // Simulation parameter constants diff --git a/custom/auth/tx/service.go b/custom/auth/tx/service.go index 04ac8428d..06997e42d 100644 --- a/custom/auth/tx/service.go +++ b/custom/auth/tx/service.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - customante "github.com/classic-terra/core/custom/auth/ante" + customante "github.com/classic-terra/core/v2/custom/auth/ante" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/custom/authz/client/cli/tx.go b/custom/authz/client/cli/tx.go index 4dfe3691c..6b076802c 100644 --- a/custom/authz/client/cli/tx.go +++ b/custom/authz/client/cli/tx.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" "github.com/cosmos/cosmos-sdk/x/authz/client/cli" - feeutils "github.com/classic-terra/core/custom/auth/client/utils" + feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" ) // GetTxCmd returns the transaction commands for this module diff --git a/custom/authz/legacy/v043/migrate.go b/custom/authz/legacy/v043/migrate.go index 58ac82c85..bbe06aafd 100644 --- a/custom/authz/legacy/v043/migrate.go +++ b/custom/authz/legacy/v043/migrate.go @@ -7,8 +7,8 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - v05market "github.com/classic-terra/core/x/market/types" - v04msgauth "github.com/classic-terra/core/x/msgauth/legacy/v04" + v05market "github.com/classic-terra/core/v2/x/market/types" + v04msgauth "github.com/classic-terra/core/v2/x/msgauth/legacy/v04" sdk "github.com/cosmos/cosmos-sdk/types" v043authz "github.com/cosmos/cosmos-sdk/x/authz" diff --git a/custom/authz/legacy/v043/migrate_test.go b/custom/authz/legacy/v043/migrate_test.go index 843d17758..7eb91548a 100644 --- a/custom/authz/legacy/v043/migrate_test.go +++ b/custom/authz/legacy/v043/migrate_test.go @@ -9,10 +9,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/app" - v043authz "github.com/classic-terra/core/custom/authz/legacy/v043" - core "github.com/classic-terra/core/types" - v04msgauth "github.com/classic-terra/core/x/msgauth/legacy/v04" + "github.com/classic-terra/core/v2/app" + v043authz "github.com/classic-terra/core/v2/custom/authz/legacy/v043" + core "github.com/classic-terra/core/v2/types" + v04msgauth "github.com/classic-terra/core/v2/x/msgauth/legacy/v04" ) func TestMigrate(t *testing.T) { diff --git a/custom/authz/module.go b/custom/authz/module.go index eaf01361e..7c3b91725 100644 --- a/custom/authz/module.go +++ b/custom/authz/module.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" authz "github.com/cosmos/cosmos-sdk/x/authz/module" - customcli "github.com/classic-terra/core/custom/authz/client/cli" - customtypes "github.com/classic-terra/core/custom/authz/types" + customcli "github.com/classic-terra/core/v2/custom/authz/client/cli" + customtypes "github.com/classic-terra/core/v2/custom/authz/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/bank/client/cli/tx.go b/custom/bank/client/cli/tx.go index 97ed5b741..848ccfc62 100644 --- a/custom/bank/client/cli/tx.go +++ b/custom/bank/client/cli/tx.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank/types" - feeutils "github.com/classic-terra/core/custom/auth/client/utils" + feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" ) // GetTxCmd returns the transaction commands for this module diff --git a/custom/bank/client/rest/tx.go b/custom/bank/client/rest/tx.go index 5eb33d77e..3c0cb1137 100644 --- a/custom/bank/client/rest/tx.go +++ b/custom/bank/client/rest/tx.go @@ -14,7 +14,7 @@ import ( bankrest "github.com/cosmos/cosmos-sdk/x/bank/client/rest" "github.com/cosmos/cosmos-sdk/x/bank/types" - feeutils "github.com/classic-terra/core/custom/auth/client/utils" + feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" ) // RegisterRoutes registers bank-related REST handlers to a router diff --git a/custom/bank/module.go b/custom/bank/module.go index dcd92ccff..557cd999d 100644 --- a/custom/bank/module.go +++ b/custom/bank/module.go @@ -12,10 +12,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/bank/types" - customcli "github.com/classic-terra/core/custom/bank/client/cli" - customrest "github.com/classic-terra/core/custom/bank/client/rest" - customsim "github.com/classic-terra/core/custom/bank/simulation" - customtypes "github.com/classic-terra/core/custom/bank/types" + customcli "github.com/classic-terra/core/v2/custom/bank/client/cli" + customrest "github.com/classic-terra/core/v2/custom/bank/client/rest" + customsim "github.com/classic-terra/core/v2/custom/bank/simulation" + customtypes "github.com/classic-terra/core/v2/custom/bank/types" ) var ( diff --git a/custom/bank/simulation/genesis.go b/custom/bank/simulation/genesis.go index 843ed7a27..cba3f5156 100644 --- a/custom/bank/simulation/genesis.go +++ b/custom/bank/simulation/genesis.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank/simulation" "github.com/cosmos/cosmos-sdk/x/bank/types" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" ) // RandomGenesisBalances returns a slice of account balances. Each account has diff --git a/custom/bank/wasm/interface.go b/custom/bank/wasm/interface.go index f19e83ba5..5173a8ba6 100644 --- a/custom/bank/wasm/interface.go +++ b/custom/bank/wasm/interface.go @@ -10,7 +10,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - wasm "github.com/classic-terra/core/x/wasm/exported" + wasm "github.com/classic-terra/core/v2/x/wasm/exported" ) var ( diff --git a/custom/bank/wasm/interface_test.go b/custom/bank/wasm/interface_test.go index d1f7ad323..1fb824e1f 100644 --- a/custom/bank/wasm/interface_test.go +++ b/custom/bank/wasm/interface_test.go @@ -9,7 +9,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" diff --git a/custom/crisis/module.go b/custom/crisis/module.go index a713d1926..05e466add 100644 --- a/custom/crisis/module.go +++ b/custom/crisis/module.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" "github.com/cosmos/cosmos-sdk/x/crisis/types" - customtypes "github.com/classic-terra/core/custom/crisis/types" - core "github.com/classic-terra/core/types" + customtypes "github.com/classic-terra/core/v2/custom/crisis/types" + core "github.com/classic-terra/core/v2/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/distribution/module.go b/custom/distribution/module.go index b157445b1..f031fead0 100644 --- a/custom/distribution/module.go +++ b/custom/distribution/module.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/distribution" "github.com/cosmos/cosmos-sdk/x/distribution/types" - customtypes "github.com/classic-terra/core/custom/distribution/types" + customtypes "github.com/classic-terra/core/v2/custom/distribution/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/distribution/types/codec.go b/custom/distribution/types/codec.go index 9dd3ed535..2c2aac2c1 100644 --- a/custom/distribution/types/codec.go +++ b/custom/distribution/types/codec.go @@ -5,7 +5,7 @@ import ( cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/x/distribution/types" - govtypes "github.com/classic-terra/core/custom/gov/types" + govtypes "github.com/classic-terra/core/v2/custom/gov/types" ) // RegisterLegacyAminoCodec registers the necessary x/distribution interfaces and concrete types diff --git a/custom/distribution/wasm/interface.go b/custom/distribution/wasm/interface.go index 74fa2ceb8..c8ae8c8de 100644 --- a/custom/distribution/wasm/interface.go +++ b/custom/distribution/wasm/interface.go @@ -9,7 +9,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - wasm "github.com/classic-terra/core/x/wasm/exported" + wasm "github.com/classic-terra/core/v2/x/wasm/exported" ) var _ wasm.WasmMsgParserInterface = MsgParser{} diff --git a/custom/evidence/module.go b/custom/evidence/module.go index 381b87d8a..45e026b2d 100644 --- a/custom/evidence/module.go +++ b/custom/evidence/module.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/evidence" "github.com/cosmos/cosmos-sdk/x/evidence/types" - customtypes "github.com/classic-terra/core/custom/evidence/types" + customtypes "github.com/classic-terra/core/v2/custom/evidence/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/feegrant/module.go b/custom/feegrant/module.go index 4de3bbe85..c0323b335 100644 --- a/custom/feegrant/module.go +++ b/custom/feegrant/module.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" feegrant "github.com/cosmos/cosmos-sdk/x/feegrant/module" - customtypes "github.com/classic-terra/core/custom/feegrant/types" + customtypes "github.com/classic-terra/core/v2/custom/feegrant/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/gov/legacy/v043/migrate.go b/custom/gov/legacy/v043/migrate.go index 4977c66bd..db541707a 100644 --- a/custom/gov/legacy/v043/migrate.go +++ b/custom/gov/legacy/v043/migrate.go @@ -17,7 +17,7 @@ import ( v038upgrade "github.com/cosmos/cosmos-sdk/x/upgrade/legacy/v038" v040upgrade "github.com/cosmos/cosmos-sdk/x/upgrade/types" - v04treasury "github.com/classic-terra/core/x/treasury/legacy/v04" + v04treasury "github.com/classic-terra/core/v2/x/treasury/legacy/v04" ) func migrateVoteOption(oldVoteOption v034gov.VoteOption) v043gov.VoteOption { diff --git a/custom/gov/module.go b/custom/gov/module.go index 754d6e984..dd475f315 100644 --- a/custom/gov/module.go +++ b/custom/gov/module.go @@ -9,8 +9,8 @@ import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" "github.com/cosmos/cosmos-sdk/x/gov/types" - customtypes "github.com/classic-terra/core/custom/gov/types" - core "github.com/classic-terra/core/types" + customtypes "github.com/classic-terra/core/v2/custom/gov/types" + core "github.com/classic-terra/core/v2/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/gov/wasm/interface.go b/custom/gov/wasm/interface.go index e5d5b85ab..8aa8383f5 100644 --- a/custom/gov/wasm/interface.go +++ b/custom/gov/wasm/interface.go @@ -8,7 +8,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - wasm "github.com/classic-terra/core/x/wasm/exported" + wasm "github.com/classic-terra/core/v2/x/wasm/exported" ) var _ wasm.WasmMsgParserInterface = MsgParser{} diff --git a/custom/mint/module.go b/custom/mint/module.go index 122f1ff91..1a500f8a3 100644 --- a/custom/mint/module.go +++ b/custom/mint/module.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/mint" "github.com/cosmos/cosmos-sdk/x/mint/types" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/params/module.go b/custom/params/module.go index 9aa47131b..d03dea6e9 100644 --- a/custom/params/module.go +++ b/custom/params/module.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/params" - customtypes "github.com/classic-terra/core/custom/params/types" + customtypes "github.com/classic-terra/core/v2/custom/params/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/params/types/codec.go b/custom/params/types/codec.go index e8dfa6efb..16ac6d2d8 100644 --- a/custom/params/types/codec.go +++ b/custom/params/types/codec.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/x/params/types/proposal" - govtypes "github.com/classic-terra/core/custom/gov/types" + govtypes "github.com/classic-terra/core/v2/custom/gov/types" ) // RegisterLegacyAminoCodec registers all necessary param module types with a given LegacyAmino codec. diff --git a/custom/slashing/module.go b/custom/slashing/module.go index 0f19f9a40..4c6391f62 100644 --- a/custom/slashing/module.go +++ b/custom/slashing/module.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/slashing" "github.com/cosmos/cosmos-sdk/x/slashing/types" - customtypes "github.com/classic-terra/core/custom/slashing/types" + customtypes "github.com/classic-terra/core/v2/custom/slashing/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/staking/module.go b/custom/staking/module.go index 9f5a62daa..7364ff12b 100644 --- a/custom/staking/module.go +++ b/custom/staking/module.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/staking/types" - customtypes "github.com/classic-terra/core/custom/staking/types" - core "github.com/classic-terra/core/types" + customtypes "github.com/classic-terra/core/v2/custom/staking/types" + core "github.com/classic-terra/core/v2/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/staking/wasm/interface.go b/custom/staking/wasm/interface.go index 205ae6881..5db6ef63d 100644 --- a/custom/staking/wasm/interface.go +++ b/custom/staking/wasm/interface.go @@ -12,7 +12,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - wasm "github.com/classic-terra/core/x/wasm/exported" + wasm "github.com/classic-terra/core/v2/x/wasm/exported" ) var ( diff --git a/custom/upgrade/module.go b/custom/upgrade/module.go index ead70de64..5b6b77c94 100644 --- a/custom/upgrade/module.go +++ b/custom/upgrade/module.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/upgrade" - customtypes "github.com/classic-terra/core/custom/upgrade/types" + customtypes "github.com/classic-terra/core/v2/custom/upgrade/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/custom/upgrade/types/codec.go b/custom/upgrade/types/codec.go index d5c9cd74d..dd89300ea 100644 --- a/custom/upgrade/types/codec.go +++ b/custom/upgrade/types/codec.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/x/upgrade/types" - govtypes "github.com/classic-terra/core/custom/gov/types" + govtypes "github.com/classic-terra/core/v2/custom/gov/types" ) // RegisterLegacyAminoCodec registers concrete types on the LegacyAmino codec diff --git a/go.mod b/go.mod index 0394f730e..a0f829090 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ go 1.18 -module github.com/classic-terra/core +module github.com/classic-terra/core/v2 require ( github.com/CosmWasm/wasmvm v0.16.7 @@ -57,7 +57,8 @@ require ( github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/gobwas/ws v1.1.0 // indirect + github.com/gobwas/httphead v0.1.0 // indirect + github.com/gobwas/pool v0.2.1 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/gateway v1.1.0 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -125,6 +126,7 @@ require ( replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 + github.com/CosmWasm/wasmvm => github.com/classic-terra/wasmvm v0.16.8-beta5 github.com/aws/aws-sdk-go v1.25.48 => github.com/aws/aws-sdk-go v1.33.0 github.com/aws/aws-sdk-go v1.27.0 => github.com/aws/aws-sdk-go v1.33.0 github.com/cosmos/cosmos-sdk => github.com/classic-terra/cosmos-sdk v0.45.13-classic diff --git a/go.sum b/go.sum index 3438753bf..a984bb8c3 100644 --- a/go.sum +++ b/go.sum @@ -283,8 +283,6 @@ github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CosmWasm/wasmvm v0.16.7 h1:3skB4RX6XMgPgwNIlxwQvxJGcdaWPJQALWgiVlqXvGc= -github.com/CosmWasm/wasmvm v0.16.7/go.mod h1:saGLYYSj6rRVFL6EaWZHzXbLD3Rgn8ZEK+0H+UjKOE4= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= @@ -547,6 +545,8 @@ github.com/classic-terra/cosmos-sdk v0.45.13-classic h1:gJ1waM0wDVoa4XpJqTn/AvtU github.com/classic-terra/cosmos-sdk v0.45.13-classic/go.mod h1:KaUwQKijD7mOiKnPa/7JOJoGfDt4Mq+1CGlODMHPmfM= github.com/classic-terra/tendermint v0.34.24-terra.0 h1:ZGaJpmKfxjlmmLO80t03jlK2SBQfJKlLsF+ItDbXtko= github.com/classic-terra/tendermint v0.34.24-terra.0/go.mod h1:rXVrl4OYzmIa1I91av3iLv2HS0fGSiucyW9J4aMTpKI= +github.com/classic-terra/wasmvm v0.16.8-beta5 h1:I/E+7ya8BY88wMu95r9QkbIeh4Nq7MDJSu6ZbZSBUY4= +github.com/classic-terra/wasmvm v0.16.8-beta5/go.mod h1:saGLYYSj6rRVFL6EaWZHzXbLD3Rgn8ZEK+0H+UjKOE4= github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -1003,9 +1003,8 @@ github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u1 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA= -github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -2753,7 +2752,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/types/alias.go b/types/alias.go index 563cabd35..d9202b54f 100644 --- a/types/alias.go +++ b/types/alias.go @@ -1,14 +1,14 @@ // Package types nolint // autogenerated code using github.com/rigelrozanski/multitool // aliases generated for the following subdirectories: -// ALIASGEN: github.com/classic-terra/core/types/assets/ -// ALIASGEN: github.com/classic-terra/core/types/util/ +// ALIASGEN: github.com/classic-terra/core/v2/types/assets/ +// ALIASGEN: github.com/classic-terra/core/v2/types/util/ package types import ( - "github.com/classic-terra/core/types/assets" - "github.com/classic-terra/core/types/fork" - "github.com/classic-terra/core/types/util" + "github.com/classic-terra/core/v2/types/assets" + "github.com/classic-terra/core/v2/types/fork" + "github.com/classic-terra/core/v2/types/util" ) const ( diff --git a/x/market/abci.go b/x/market/abci.go index d1dcbf124..91322b508 100644 --- a/x/market/abci.go +++ b/x/market/abci.go @@ -3,7 +3,7 @@ package market import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/keeper" ) // EndBlocker is called at the end of every block diff --git a/x/market/abci_test.go b/x/market/abci_test.go index 1615ce662..2fba640cf 100644 --- a/x/market/abci_test.go +++ b/x/market/abci_test.go @@ -3,7 +3,7 @@ package market import ( "testing" - "github.com/classic-terra/core/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/keeper" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/market/client/cli/query.go b/x/market/client/cli/query.go index 23ed7dc30..50b1d412a 100644 --- a/x/market/client/cli/query.go +++ b/x/market/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/market/client/cli/tx.go b/x/market/client/cli/tx.go index f0e7e04ea..fa46365e0 100644 --- a/x/market/client/cli/tx.go +++ b/x/market/client/cli/tx.go @@ -10,8 +10,8 @@ import ( "github.com/spf13/cobra" - feeutils "github.com/classic-terra/core/custom/auth/client/utils" - "github.com/classic-terra/core/x/market/types" + feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" + "github.com/classic-terra/core/v2/x/market/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/market/client/rest/query.go b/x/market/client/rest/query.go index 13c591500..8d7028bf0 100644 --- a/x/market/client/rest/query.go +++ b/x/market/client/rest/query.go @@ -7,7 +7,7 @@ import ( "github.com/gorilla/mux" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/market/client/rest/tx.go b/x/market/client/rest/tx.go index 50d2cae11..2c54113ef 100644 --- a/x/market/client/rest/tx.go +++ b/x/market/client/rest/tx.go @@ -11,8 +11,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" - feeutils "github.com/classic-terra/core/custom/auth/client/utils" - "github.com/classic-terra/core/x/market/types" + feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" + "github.com/classic-terra/core/v2/x/market/types" ) func registerTxHandlers(clientCtx client.Context, rtr *mux.Router) { diff --git a/x/market/common_test.go b/x/market/common_test.go index 8c5e5f265..7a2a34c27 100644 --- a/x/market/common_test.go +++ b/x/market/common_test.go @@ -3,8 +3,8 @@ package market import ( "testing" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market/keeper" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/market/exported/alias.go b/x/market/exported/alias.go index 3e2911661..bffd31f2b 100644 --- a/x/market/exported/alias.go +++ b/x/market/exported/alias.go @@ -1,7 +1,7 @@ // DONTCOVER package exported -import "github.com/classic-terra/core/x/market/types" +import "github.com/classic-terra/core/v2/x/market/types" type ( MsgSwap = types.MsgSwap diff --git a/x/market/genesis.go b/x/market/genesis.go index 8d955c71d..f274e93a4 100644 --- a/x/market/genesis.go +++ b/x/market/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/market/keeper" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/types" ) // InitGenesis initialize default parameters diff --git a/x/market/genesis_test.go b/x/market/genesis_test.go index c6a76838e..9e7845d0b 100644 --- a/x/market/genesis_test.go +++ b/x/market/genesis_test.go @@ -3,7 +3,7 @@ package market import ( "testing" - "github.com/classic-terra/core/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/keeper" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/market/handler.go b/x/market/handler.go index 6f0cc9307..a1579997c 100644 --- a/x/market/handler.go +++ b/x/market/handler.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/classic-terra/core/x/market/keeper" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/types" ) // NewHandler creates a new handler for all market type messages. diff --git a/x/market/handler_test.go b/x/market/handler_test.go index 3c7148ac7..c02ac4e63 100644 --- a/x/market/handler_test.go +++ b/x/market/handler_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market/keeper" - "github.com/classic-terra/core/x/market/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/types" ) func TestMarketFilters(t *testing.T) { diff --git a/x/market/keeper/alias_functions.go b/x/market/keeper/alias_functions.go index eb4f29728..e0f99b6f6 100644 --- a/x/market/keeper/alias_functions.go +++ b/x/market/keeper/alias_functions.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/x/market/keeper/keeper.go b/x/market/keeper/keeper.go index 15323a655..a757fd207 100644 --- a/x/market/keeper/keeper.go +++ b/x/market/keeper/keeper.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" ) // Keeper of the market store diff --git a/x/market/keeper/keeper_test.go b/x/market/keeper/keeper_test.go index 5016c7ac0..4ceea432e 100644 --- a/x/market/keeper/keeper_test.go +++ b/x/market/keeper/keeper_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/market/keeper/legacy_querier.go b/x/market/keeper/legacy_querier.go index 1b95f1030..705da47af 100644 --- a/x/market/keeper/legacy_querier.go +++ b/x/market/keeper/legacy_querier.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" abci "github.com/tendermint/tendermint/abci/types" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/market/keeper/legacy_querier_test.go b/x/market/keeper/legacy_querier_test.go index 0af5abfc6..3a03cc0d2 100644 --- a/x/market/keeper/legacy_querier_test.go +++ b/x/market/keeper/legacy_querier_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market/types" ) func TestNewLegacyQuerier(t *testing.T) { diff --git a/x/market/keeper/msg_server.go b/x/market/keeper/msg_server.go index 0186aa905..a156b830b 100644 --- a/x/market/keeper/msg_server.go +++ b/x/market/keeper/msg_server.go @@ -5,9 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market/types" - oracletypes "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market/types" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" ) type msgServer struct { diff --git a/x/market/keeper/params.go b/x/market/keeper/params.go index 1db903596..ccfe60025 100644 --- a/x/market/keeper/params.go +++ b/x/market/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/market/keeper/querier.go b/x/market/keeper/querier.go index 2cdf50e67..0fcb67f77 100644 --- a/x/market/keeper/querier.go +++ b/x/market/keeper/querier.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" ) // querier is used as Keeper will have duplicate methods if used directly, and gRPC names take precedence over q diff --git a/x/market/keeper/querier_test.go b/x/market/keeper/querier_test.go index 8eb726b6f..45f29d242 100644 --- a/x/market/keeper/querier_test.go +++ b/x/market/keeper/querier_test.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market/types" "github.com/stretchr/testify/require" ) diff --git a/x/market/keeper/swap.go b/x/market/keeper/swap.go index 2e3d8de07..9dc1ad533 100644 --- a/x/market/keeper/swap.go +++ b/x/market/keeper/swap.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/market/keeper/swap_test.go b/x/market/keeper/swap_test.go index 7c50b2233..82b885555 100644 --- a/x/market/keeper/swap_test.go +++ b/x/market/keeper/swap_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/market/keeper/test_utils.go b/x/market/keeper/test_utils.go index 77e93e6f3..544ba605a 100644 --- a/x/market/keeper/test_utils.go +++ b/x/market/keeper/test_utils.go @@ -9,16 +9,16 @@ import ( "github.com/stretchr/testify/require" - customauth "github.com/classic-terra/core/custom/auth" - custombank "github.com/classic-terra/core/custom/bank" - customdistr "github.com/classic-terra/core/custom/distribution" - customparams "github.com/classic-terra/core/custom/params" - customstaking "github.com/classic-terra/core/custom/staking" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market/types" - "github.com/classic-terra/core/x/oracle" - oraclekeeper "github.com/classic-terra/core/x/oracle/keeper" - oracletypes "github.com/classic-terra/core/x/oracle/types" + customauth "github.com/classic-terra/core/v2/custom/auth" + custombank "github.com/classic-terra/core/v2/custom/bank" + customdistr "github.com/classic-terra/core/v2/custom/distribution" + customparams "github.com/classic-terra/core/v2/custom/params" + customstaking "github.com/classic-terra/core/v2/custom/staking" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v2/x/oracle" + oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/secp256k1" diff --git a/x/market/legacy/v05/migrate.go b/x/market/legacy/v05/migrate.go index 7330f24c2..60957c28f 100644 --- a/x/market/legacy/v05/migrate.go +++ b/x/market/legacy/v05/migrate.go @@ -3,8 +3,8 @@ package v05 import ( sdk "github.com/cosmos/cosmos-sdk/types" - v04market "github.com/classic-terra/core/x/market/legacy/v04" - v05market "github.com/classic-terra/core/x/market/types" + v04market "github.com/classic-terra/core/v2/x/market/legacy/v04" + v05market "github.com/classic-terra/core/v2/x/market/types" ) // Migrate accepts exported v0.4 x/market and diff --git a/x/market/legacy/v05/migrate_test.go b/x/market/legacy/v05/migrate_test.go index 612134c31..e85a09649 100644 --- a/x/market/legacy/v05/migrate_test.go +++ b/x/market/legacy/v05/migrate_test.go @@ -10,10 +10,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/app" - core "github.com/classic-terra/core/types" - v04market "github.com/classic-terra/core/x/market/legacy/v04" - v05market "github.com/classic-terra/core/x/market/legacy/v05" + "github.com/classic-terra/core/v2/app" + core "github.com/classic-terra/core/v2/types" + v04market "github.com/classic-terra/core/v2/x/market/legacy/v04" + v05market "github.com/classic-terra/core/v2/x/market/legacy/v05" ) func TestMigrate(t *testing.T) { diff --git a/x/market/module.go b/x/market/module.go index 931b00115..79acae4b1 100644 --- a/x/market/module.go +++ b/x/market/module.go @@ -20,11 +20,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/classic-terra/core/x/market/client/cli" - "github.com/classic-terra/core/x/market/client/rest" - "github.com/classic-terra/core/x/market/keeper" - "github.com/classic-terra/core/x/market/simulation" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/client/cli" + "github.com/classic-terra/core/v2/x/market/client/rest" + "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/simulation" + "github.com/classic-terra/core/v2/x/market/types" ) var ( diff --git a/x/market/simulation/decoder.go b/x/market/simulation/decoder.go index b821bbe7c..1b4ee57a5 100644 --- a/x/market/simulation/decoder.go +++ b/x/market/simulation/decoder.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/market/simulation/decoder_test.go b/x/market/simulation/decoder_test.go index b7373b938..29b8c3510 100644 --- a/x/market/simulation/decoder_test.go +++ b/x/market/simulation/decoder_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/x/market/keeper" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/types" ) func TestDecodeDistributionStore(t *testing.T) { diff --git a/x/market/simulation/genesis.go b/x/market/simulation/genesis.go index 9406a8fb1..612c48fb0 100644 --- a/x/market/simulation/genesis.go +++ b/x/market/simulation/genesis.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" ) // Simulation parameter constants diff --git a/x/market/simulation/operations.go b/x/market/simulation/operations.go index 12619e3b2..21e6e4b39 100644 --- a/x/market/simulation/operations.go +++ b/x/market/simulation/operations.go @@ -6,7 +6,7 @@ import ( "math/rand" "strings" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" @@ -16,7 +16,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" ) // Simulation operation weights constants diff --git a/x/market/simulation/params.go b/x/market/simulation/params.go index 89711d6f9..6a61eb54a 100644 --- a/x/market/simulation/params.go +++ b/x/market/simulation/params.go @@ -9,7 +9,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/classic-terra/core/x/market/types" + "github.com/classic-terra/core/v2/x/market/types" ) // ParamChanges defines the parameters that can be modified by param change proposals diff --git a/x/market/types/msgs_test.go b/x/market/types/msgs_test.go index c5f6313f6..0ad640a92 100644 --- a/x/market/types/msgs_test.go +++ b/x/market/types/msgs_test.go @@ -3,7 +3,7 @@ package types import ( "testing" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" "github.com/stretchr/testify/require" diff --git a/x/market/types/params.go b/x/market/types/params.go index a01c8d22b..5f3ddbe12 100644 --- a/x/market/types/params.go +++ b/x/market/types/params.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" ) // Parameter keys diff --git a/x/market/wasm/interface.go b/x/market/wasm/interface.go index f2170f062..a89e942f6 100644 --- a/x/market/wasm/interface.go +++ b/x/market/wasm/interface.go @@ -8,9 +8,9 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - "github.com/classic-terra/core/x/market/keeper" - "github.com/classic-terra/core/x/market/types" - wasm "github.com/classic-terra/core/x/wasm/exported" + "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/types" + wasm "github.com/classic-terra/core/v2/x/wasm/exported" ) var ( diff --git a/x/market/wasm/interface_test.go b/x/market/wasm/interface_test.go index 7c9b2dc22..bcd84738c 100644 --- a/x/market/wasm/interface_test.go +++ b/x/market/wasm/interface_test.go @@ -14,9 +14,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market/keeper" - "github.com/classic-terra/core/x/market/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market/keeper" + "github.com/classic-terra/core/v2/x/market/types" ) func TestEncoding(t *testing.T) { diff --git a/x/oracle/abci.go b/x/oracle/abci.go index ce3bd3b89..b248d605b 100644 --- a/x/oracle/abci.go +++ b/x/oracle/abci.go @@ -3,9 +3,9 @@ package oracle import ( "time" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/oracle/abci_test.go b/x/oracle/abci_test.go index 0bd6ce497..21155bd68 100644 --- a/x/oracle/abci_test.go +++ b/x/oracle/abci_test.go @@ -12,10 +12,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/types" ) func TestOracleThreshold(t *testing.T) { diff --git a/x/oracle/client/cli/query.go b/x/oracle/client/cli/query.go index 120f2dc0b..26e6d3e5f 100644 --- a/x/oracle/client/cli/query.go +++ b/x/oracle/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/oracle/client/cli/tx.go b/x/oracle/client/cli/tx.go index 5cd777e66..df48ba302 100644 --- a/x/oracle/client/cli/tx.go +++ b/x/oracle/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/oracle/client/rest/query.go b/x/oracle/client/rest/query.go index 5f37a2819..2342e8ba0 100644 --- a/x/oracle/client/rest/query.go +++ b/x/oracle/client/rest/query.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/mux" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/oracle/client/rest/tx.go b/x/oracle/client/rest/tx.go index eb3055068..499cb5518 100644 --- a/x/oracle/client/rest/tx.go +++ b/x/oracle/client/rest/tx.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" diff --git a/x/oracle/common_test.go b/x/oracle/common_test.go index b9114017d..dfd31f689 100644 --- a/x/oracle/common_test.go +++ b/x/oracle/common_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/classic-terra/core/x/oracle" - "github.com/classic-terra/core/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle" + "github.com/classic-terra/core/v2/x/oracle/keeper" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking" diff --git a/x/oracle/exported/alias.go b/x/oracle/exported/alias.go index 2265fe056..5146a1288 100644 --- a/x/oracle/exported/alias.go +++ b/x/oracle/exported/alias.go @@ -1,7 +1,7 @@ // DONTCOVER package exported -import "github.com/classic-terra/core/x/oracle/types" +import "github.com/classic-terra/core/v2/x/oracle/types" type ( MsgAggregateExchangeRatePrevote = types.MsgAggregateExchangeRatePrevote diff --git a/x/oracle/genesis.go b/x/oracle/genesis.go index 585ee85f2..1fc0768d8 100644 --- a/x/oracle/genesis.go +++ b/x/oracle/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/types" ) // InitGenesis initialize default parameters diff --git a/x/oracle/genesis_test.go b/x/oracle/genesis_test.go index 34062e907..ede1f2edc 100644 --- a/x/oracle/genesis_test.go +++ b/x/oracle/genesis_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/classic-terra/core/x/oracle" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/oracle/handler.go b/x/oracle/handler.go index 08014e0bd..b6d48bdb1 100644 --- a/x/oracle/handler.go +++ b/x/oracle/handler.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/types" ) // NewHandler returns a handler for "oracle" type messages. diff --git a/x/oracle/handler_test.go b/x/oracle/handler_test.go index 750a07fb1..a3280c4eb 100644 --- a/x/oracle/handler_test.go +++ b/x/oracle/handler_test.go @@ -11,9 +11,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/types" ) func TestOracleFilters(t *testing.T) { diff --git a/x/oracle/keeper/alias_functions.go b/x/oracle/keeper/alias_functions.go index 18355371f..b39706833 100644 --- a/x/oracle/keeper/alias_functions.go +++ b/x/oracle/keeper/alias_functions.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) // GetOracleAccount returns oracle ModuleAccount diff --git a/x/oracle/keeper/ballot.go b/x/oracle/keeper/ballot.go index 31b7dc618..c58e2622d 100644 --- a/x/oracle/keeper/ballot.go +++ b/x/oracle/keeper/ballot.go @@ -5,7 +5,7 @@ import ( "sort" "strings" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" diff --git a/x/oracle/keeper/ballot_test.go b/x/oracle/keeper/ballot_test.go index bcee2df9b..fed0f84bd 100644 --- a/x/oracle/keeper/ballot_test.go +++ b/x/oracle/keeper/ballot_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking" diff --git a/x/oracle/keeper/keeper.go b/x/oracle/keeper/keeper.go index c9d84e87f..e32263094 100644 --- a/x/oracle/keeper/keeper.go +++ b/x/oracle/keeper/keeper.go @@ -13,8 +13,8 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) // Keeper of the oracle store diff --git a/x/oracle/keeper/keeper_test.go b/x/oracle/keeper/keeper_test.go index 59b53b5ca..bfde54ad7 100644 --- a/x/oracle/keeper/keeper_test.go +++ b/x/oracle/keeper/keeper_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" diff --git a/x/oracle/keeper/legacy_querier.go b/x/oracle/keeper/legacy_querier.go index 47294faf0..f5c24a54c 100644 --- a/x/oracle/keeper/legacy_querier.go +++ b/x/oracle/keeper/legacy_querier.go @@ -8,7 +8,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) // NewLegacyQuerier is the module level router for state queries diff --git a/x/oracle/keeper/legacy_querier_test.go b/x/oracle/keeper/legacy_querier_test.go index d2170e584..0f1547b1a 100644 --- a/x/oracle/keeper/legacy_querier_test.go +++ b/x/oracle/keeper/legacy_querier_test.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) func TestLegacyNewLegacyQuerier(t *testing.T) { diff --git a/x/oracle/keeper/msg_server.go b/x/oracle/keeper/msg_server.go index ec8b52081..53b60c120 100644 --- a/x/oracle/keeper/msg_server.go +++ b/x/oracle/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) type msgServer struct { diff --git a/x/oracle/keeper/msg_server_test.go b/x/oracle/keeper/msg_server_test.go index 38fdf5183..e1e81bc2a 100644 --- a/x/oracle/keeper/msg_server_test.go +++ b/x/oracle/keeper/msg_server_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/cosmos/cosmos-sdk/x/staking" ) diff --git a/x/oracle/keeper/params.go b/x/oracle/keeper/params.go index caae2db81..4527300d0 100644 --- a/x/oracle/keeper/params.go +++ b/x/oracle/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/oracle/keeper/querier.go b/x/oracle/keeper/querier.go index 45324a4f8..248a0c0f2 100644 --- a/x/oracle/keeper/querier.go +++ b/x/oracle/keeper/querier.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) // querier is used as Keeper will have duplicate methods if used directly, and gRPC names take precedence over q diff --git a/x/oracle/keeper/querier_test.go b/x/oracle/keeper/querier_test.go index 4aa8bf96e..6ef4cee32 100644 --- a/x/oracle/keeper/querier_test.go +++ b/x/oracle/keeper/querier_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) func TestQueryParams(t *testing.T) { diff --git a/x/oracle/keeper/reward.go b/x/oracle/keeper/reward.go index 558a66ee6..df49ab084 100644 --- a/x/oracle/keeper/reward.go +++ b/x/oracle/keeper/reward.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) // RewardBallotWinners implements diff --git a/x/oracle/keeper/reward_test.go b/x/oracle/keeper/reward_test.go index 0770c6865..1cdc7d884 100644 --- a/x/oracle/keeper/reward_test.go +++ b/x/oracle/keeper/reward_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) // Test a reward giving mechanism diff --git a/x/oracle/keeper/test_utils.go b/x/oracle/keeper/test_utils.go index b0947effe..19e0cb901 100644 --- a/x/oracle/keeper/test_utils.go +++ b/x/oracle/keeper/test_utils.go @@ -4,13 +4,13 @@ import ( "testing" "time" - customauth "github.com/classic-terra/core/custom/auth" - custombank "github.com/classic-terra/core/custom/bank" - customdistr "github.com/classic-terra/core/custom/distribution" - customparams "github.com/classic-terra/core/custom/params" - customstaking "github.com/classic-terra/core/custom/staking" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + customauth "github.com/classic-terra/core/v2/custom/auth" + custombank "github.com/classic-terra/core/v2/custom/bank" + customdistr "github.com/classic-terra/core/v2/custom/distribution" + customparams "github.com/classic-terra/core/v2/custom/params" + customstaking "github.com/classic-terra/core/v2/custom/staking" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto" diff --git a/x/oracle/legacy/v05/migrate.go b/x/oracle/legacy/v05/migrate.go index 55914b771..970198efa 100644 --- a/x/oracle/legacy/v05/migrate.go +++ b/x/oracle/legacy/v05/migrate.go @@ -3,8 +3,8 @@ package v05 import ( "sort" - v04oracle "github.com/classic-terra/core/x/oracle/legacy/v04" - v05oracle "github.com/classic-terra/core/x/oracle/types" + v04oracle "github.com/classic-terra/core/v2/x/oracle/legacy/v04" + v05oracle "github.com/classic-terra/core/v2/x/oracle/types" ) // Migrate accepts exported v0.4 x/oracle and diff --git a/x/oracle/legacy/v05/migrate_test.go b/x/oracle/legacy/v05/migrate_test.go index 7d1159080..f9a26943a 100644 --- a/x/oracle/legacy/v05/migrate_test.go +++ b/x/oracle/legacy/v05/migrate_test.go @@ -10,10 +10,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/app" - core "github.com/classic-terra/core/types" - v04oracle "github.com/classic-terra/core/x/oracle/legacy/v04" - v05oracle "github.com/classic-terra/core/x/oracle/legacy/v05" + "github.com/classic-terra/core/v2/app" + core "github.com/classic-terra/core/v2/types" + v04oracle "github.com/classic-terra/core/v2/x/oracle/legacy/v04" + v05oracle "github.com/classic-terra/core/v2/x/oracle/legacy/v05" ) func TestMigrate(t *testing.T) { diff --git a/x/oracle/module.go b/x/oracle/module.go index 7ed10e3c6..5069c858e 100644 --- a/x/oracle/module.go +++ b/x/oracle/module.go @@ -19,11 +19,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/classic-terra/core/x/oracle/client/cli" - "github.com/classic-terra/core/x/oracle/client/rest" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/simulation" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/client/cli" + "github.com/classic-terra/core/v2/x/oracle/client/rest" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/simulation" + "github.com/classic-terra/core/v2/x/oracle/types" ) var ( diff --git a/x/oracle/simulation/decoder.go b/x/oracle/simulation/decoder.go index b06110778..eb57a8cf5 100644 --- a/x/oracle/simulation/decoder.go +++ b/x/oracle/simulation/decoder.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/oracle/simulation/decoder_test.go b/x/oracle/simulation/decoder_test.go index 50c5c50e7..29e63561a 100644 --- a/x/oracle/simulation/decoder_test.go +++ b/x/oracle/simulation/decoder_test.go @@ -12,10 +12,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/keeper" - sim "github.com/classic-terra/core/x/oracle/simulation" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/keeper" + sim "github.com/classic-terra/core/v2/x/oracle/simulation" + "github.com/classic-terra/core/v2/x/oracle/types" ) var ( diff --git a/x/oracle/simulation/genesis.go b/x/oracle/simulation/genesis.go index d2d9a1207..c07b3ea5f 100644 --- a/x/oracle/simulation/genesis.go +++ b/x/oracle/simulation/genesis.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) // Simulation parameter constants diff --git a/x/oracle/simulation/operations.go b/x/oracle/simulation/operations.go index dd7a6db93..066810f39 100644 --- a/x/oracle/simulation/operations.go +++ b/x/oracle/simulation/operations.go @@ -14,9 +14,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/types" ) // Simulation operation weights constants diff --git a/x/oracle/simulation/params.go b/x/oracle/simulation/params.go index 92387162c..7685764b3 100644 --- a/x/oracle/simulation/params.go +++ b/x/oracle/simulation/params.go @@ -9,7 +9,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) // ParamChanges defines the parameters that can be modified by param change proposals diff --git a/x/oracle/tally.go b/x/oracle/tally.go index a713dcd64..edc290df6 100644 --- a/x/oracle/tally.go +++ b/x/oracle/tally.go @@ -3,9 +3,9 @@ package oracle import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/types" ) // Tally calculates the median and returns it. Sets the set of voters to be rewarded, i.e. voted within diff --git a/x/oracle/tally_fuzz_test.go b/x/oracle/tally_fuzz_test.go index c5eee3d8e..4782ef9d4 100644 --- a/x/oracle/tally_fuzz_test.go +++ b/x/oracle/tally_fuzz_test.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/oracle" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle" + "github.com/classic-terra/core/v2/x/oracle/types" ) func TestFuzz_Tally(t *testing.T) { diff --git a/x/oracle/types/ballot_test.go b/x/oracle/types/ballot_test.go index fdc208eb3..5a212b6a2 100644 --- a/x/oracle/types/ballot_test.go +++ b/x/oracle/types/ballot_test.go @@ -14,8 +14,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" ) func TestToMap(t *testing.T) { diff --git a/x/oracle/types/denom_test.go b/x/oracle/types/denom_test.go index 92dfe60a4..0b8002b06 100644 --- a/x/oracle/types/denom_test.go +++ b/x/oracle/types/denom_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/oracle/types/genesis_test.go b/x/oracle/types/genesis_test.go index 45f3375d3..095f23334 100644 --- a/x/oracle/types/genesis_test.go +++ b/x/oracle/types/genesis_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "github.com/classic-terra/core/app" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/app" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/stretchr/testify/require" ) diff --git a/x/oracle/types/hash_test.go b/x/oracle/types/hash_test.go index 0b87a821c..300737a35 100644 --- a/x/oracle/types/hash_test.go +++ b/x/oracle/types/hash_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/oracle/types/msgs_test.go b/x/oracle/types/msgs_test.go index 63f4a876b..c982bc9f2 100644 --- a/x/oracle/types/msgs_test.go +++ b/x/oracle/types/msgs_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/stretchr/testify/require" diff --git a/x/oracle/types/params.go b/x/oracle/types/params.go index 153eb2a70..f54bf4cea 100644 --- a/x/oracle/types/params.go +++ b/x/oracle/types/params.go @@ -5,7 +5,7 @@ import ( "gopkg.in/yaml.v2" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/oracle/types/params_test.go b/x/oracle/types/params_test.go index 6aa0f19d1..b9c260bfe 100644 --- a/x/oracle/types/params_test.go +++ b/x/oracle/types/params_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/oracle/types/vote_test.go b/x/oracle/types/vote_test.go index 50a64236c..3bc4d7119 100644 --- a/x/oracle/types/vote_test.go +++ b/x/oracle/types/vote_test.go @@ -3,7 +3,7 @@ package types_test import ( "testing" - "github.com/classic-terra/core/x/oracle/types" + "github.com/classic-terra/core/v2/x/oracle/types" "github.com/stretchr/testify/require" ) diff --git a/x/oracle/wasm/interface.go b/x/oracle/wasm/interface.go index 4f6736083..84235e894 100644 --- a/x/oracle/wasm/interface.go +++ b/x/oracle/wasm/interface.go @@ -8,8 +8,8 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - "github.com/classic-terra/core/x/oracle/keeper" - wasm "github.com/classic-terra/core/x/wasm/exported" + "github.com/classic-terra/core/v2/x/oracle/keeper" + wasm "github.com/classic-terra/core/v2/x/wasm/exported" ) var _ wasm.WasmQuerierInterface = Querier{} diff --git a/x/oracle/wasm/interface_test.go b/x/oracle/wasm/interface_test.go index b464f5ada..6c582ebf4 100644 --- a/x/oracle/wasm/interface_test.go +++ b/x/oracle/wasm/interface_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/oracle/keeper" - "github.com/classic-terra/core/x/oracle/wasm" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/oracle/keeper" + "github.com/classic-terra/core/v2/x/oracle/wasm" ) func TestQueryExchangeRates(t *testing.T) { diff --git a/x/treasury/abci.go b/x/treasury/abci.go index 4051898a9..cd4d5ee81 100644 --- a/x/treasury/abci.go +++ b/x/treasury/abci.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/keeper" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/keeper" + "github.com/classic-terra/core/v2/x/treasury/types" ) // EndBlocker is called at the end of every block diff --git a/x/treasury/abci_test.go b/x/treasury/abci_test.go index 453e032ba..90dd6c3c2 100644 --- a/x/treasury/abci_test.go +++ b/x/treasury/abci_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/keeper" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/keeper" + "github.com/classic-terra/core/v2/x/treasury/types" ) func TestBurnAddress(t *testing.T) { diff --git a/x/treasury/client/cli/gov_tx.go b/x/treasury/client/cli/gov_tx.go index 3daf08524..de88a8ca4 100644 --- a/x/treasury/client/cli/gov_tx.go +++ b/x/treasury/client/cli/gov_tx.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/treasury/client/cli/query.go b/x/treasury/client/cli/query.go index 5831a53db..c1fd4db1b 100644 --- a/x/treasury/client/cli/query.go +++ b/x/treasury/client/cli/query.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" "github.com/spf13/cobra" diff --git a/x/treasury/client/proposal_handler.go b/x/treasury/client/proposal_handler.go index e7561a4a0..45a8029f3 100644 --- a/x/treasury/client/proposal_handler.go +++ b/x/treasury/client/proposal_handler.go @@ -3,7 +3,7 @@ package client import ( "net/http" - "github.com/classic-terra/core/x/treasury/client/cli" + "github.com/classic-terra/core/v2/x/treasury/client/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/types/rest" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" diff --git a/x/treasury/client/rest/query.go b/x/treasury/client/rest/query.go index 82403699e..1b4b2e30d 100644 --- a/x/treasury/client/rest/query.go +++ b/x/treasury/client/rest/query.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" "github.com/gorilla/mux" diff --git a/x/treasury/exported/alias.go b/x/treasury/exported/alias.go index 43747c651..817375cf8 100644 --- a/x/treasury/exported/alias.go +++ b/x/treasury/exported/alias.go @@ -2,7 +2,7 @@ package exported import ( - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) var NewQueryClient = types.NewQueryClient diff --git a/x/treasury/genesis.go b/x/treasury/genesis.go index bc8435262..8157be12b 100644 --- a/x/treasury/genesis.go +++ b/x/treasury/genesis.go @@ -5,9 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/keeper" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/keeper" + "github.com/classic-terra/core/v2/x/treasury/types" ) // InitGenesis initializes default parameters diff --git a/x/treasury/genesis_test.go b/x/treasury/genesis_test.go index fcdc56729..22780ee41 100644 --- a/x/treasury/genesis_test.go +++ b/x/treasury/genesis_test.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/keeper" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/keeper" ) func TestExportInitGenesis(t *testing.T) { diff --git a/x/treasury/keeper/alias_functions.go b/x/treasury/keeper/alias_functions.go index 12a455bc9..87a06c4a3 100644 --- a/x/treasury/keeper/alias_functions.go +++ b/x/treasury/keeper/alias_functions.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) // GetTreasuryModuleAccount returns treasury ModuleAccount diff --git a/x/treasury/keeper/burn_account.go b/x/treasury/keeper/burn_account.go index e13e98cbb..7db0cfb68 100644 --- a/x/treasury/keeper/burn_account.go +++ b/x/treasury/keeper/burn_account.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/burn_account_test.go b/x/treasury/keeper/burn_account_test.go index 4a9397171..7ae3cb7b0 100644 --- a/x/treasury/keeper/burn_account_test.go +++ b/x/treasury/keeper/burn_account_test.go @@ -3,7 +3,7 @@ package keeper import ( "testing" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" "github.com/stretchr/testify/require" ) diff --git a/x/treasury/keeper/gov.go b/x/treasury/keeper/gov.go index 539a65928..444d9ec91 100644 --- a/x/treasury/keeper/gov.go +++ b/x/treasury/keeper/gov.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/indicator.go b/x/treasury/keeper/indicator.go index 806cee902..037d81a94 100644 --- a/x/treasury/keeper/indicator.go +++ b/x/treasury/keeper/indicator.go @@ -1,7 +1,7 @@ package keeper import ( - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/indicator_test.go b/x/treasury/keeper/indicator_test.go index 05291ea8b..44e5d24b2 100644 --- a/x/treasury/keeper/indicator_test.go +++ b/x/treasury/keeper/indicator_test.go @@ -3,7 +3,7 @@ package keeper import ( "testing" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/treasury/keeper/keeper.go b/x/treasury/keeper/keeper.go index 9aded0aec..535349490 100644 --- a/x/treasury/keeper/keeper.go +++ b/x/treasury/keeper/keeper.go @@ -8,11 +8,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" "github.com/tendermint/tendermint/libs/log" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) // TaxPowerUpgradeHeight is when taxes are allowed to go into effect diff --git a/x/treasury/keeper/keeper_test.go b/x/treasury/keeper/keeper_test.go index f85063fb1..5809bd9b5 100644 --- a/x/treasury/keeper/keeper_test.go +++ b/x/treasury/keeper/keeper_test.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) func TestRewardWeight(t *testing.T) { diff --git a/x/treasury/keeper/legacy_querier.go b/x/treasury/keeper/legacy_querier.go index 7d1a1f03d..44c20e851 100644 --- a/x/treasury/keeper/legacy_querier.go +++ b/x/treasury/keeper/legacy_querier.go @@ -11,8 +11,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) // NewLegacyQuerier is the module level router for state queries diff --git a/x/treasury/keeper/legacy_querier_test.go b/x/treasury/keeper/legacy_querier_test.go index 58c353a7c..4ec481404 100644 --- a/x/treasury/keeper/legacy_querier_test.go +++ b/x/treasury/keeper/legacy_querier_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/types" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" @@ -328,7 +328,7 @@ func TestLegacyQueryIndicators(t *testing.T) { require.Equal(t, targetIndicators, queriedIndicators) } -// go test -v -run ^TestLegacyQueryBurnTaxExemptionList$ github.com/classic-terra/core/x/treasury/keeper +// go test -v -run ^TestLegacyQueryBurnTaxExemptionList$ github.com/classic-terra/core/v2/x/treasury/keeper func TestLegacyQueryBurnTaxExemptionList(t *testing.T) { input := CreateTestInput(t) querier := NewLegacyQuerier(input.TreasuryKeeper, input.Cdc) diff --git a/x/treasury/keeper/migrations.go b/x/treasury/keeper/migrations.go index 8dbe3f016..45dc9b32e 100644 --- a/x/treasury/keeper/migrations.go +++ b/x/treasury/keeper/migrations.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/params.go b/x/treasury/keeper/params.go index f8f6f5541..962431da5 100644 --- a/x/treasury/keeper/params.go +++ b/x/treasury/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/keeper/policy_test.go b/x/treasury/keeper/policy_test.go index 1b2797eca..01c8517ca 100644 --- a/x/treasury/keeper/policy_test.go +++ b/x/treasury/keeper/policy_test.go @@ -3,9 +3,9 @@ package keeper import ( "testing" - core "github.com/classic-terra/core/types" - oracletypes "github.com/classic-terra/core/x/oracle/types" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v2/x/treasury/types" "github.com/stretchr/testify/require" diff --git a/x/treasury/keeper/querier.go b/x/treasury/keeper/querier.go index 9fd465edf..4bac36c92 100644 --- a/x/treasury/keeper/querier.go +++ b/x/treasury/keeper/querier.go @@ -11,8 +11,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) // querier is used as Keeper will have duplicate methods if used directly, and gRPC names take precedence over q diff --git a/x/treasury/keeper/querier_test.go b/x/treasury/keeper/querier_test.go index ef71a964b..af2d321b2 100644 --- a/x/treasury/keeper/querier_test.go +++ b/x/treasury/keeper/querier_test.go @@ -3,8 +3,8 @@ package keeper import ( "testing" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/types" "github.com/stretchr/testify/require" diff --git a/x/treasury/keeper/seigniorage.go b/x/treasury/keeper/seigniorage.go index fe3c2c436..dbedbc8f9 100644 --- a/x/treasury/keeper/seigniorage.go +++ b/x/treasury/keeper/seigniorage.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) // SettleSeigniorage computes seigniorage and distributes it to oracle and distribution(community-pool) account diff --git a/x/treasury/keeper/seigniorage_test.go b/x/treasury/keeper/seigniorage_test.go index 330fed1d1..b4c72b347 100644 --- a/x/treasury/keeper/seigniorage_test.go +++ b/x/treasury/keeper/seigniorage_test.go @@ -4,7 +4,7 @@ import ( "math/rand" "testing" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" "github.com/stretchr/testify/require" diff --git a/x/treasury/keeper/test_utils.go b/x/treasury/keeper/test_utils.go index 9c4abd7cd..e450c7d8e 100644 --- a/x/treasury/keeper/test_utils.go +++ b/x/treasury/keeper/test_utils.go @@ -6,19 +6,19 @@ import ( "github.com/stretchr/testify/require" - customauth "github.com/classic-terra/core/custom/auth" - custombank "github.com/classic-terra/core/custom/bank" - customdistr "github.com/classic-terra/core/custom/distribution" - customparams "github.com/classic-terra/core/custom/params" - customstaking "github.com/classic-terra/core/custom/staking" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market" - marketkeeper "github.com/classic-terra/core/x/market/keeper" - markettypes "github.com/classic-terra/core/x/market/types" - "github.com/classic-terra/core/x/oracle" - oraclekeeper "github.com/classic-terra/core/x/oracle/keeper" - oracletypes "github.com/classic-terra/core/x/oracle/types" - "github.com/classic-terra/core/x/treasury/types" + customauth "github.com/classic-terra/core/v2/custom/auth" + custombank "github.com/classic-terra/core/v2/custom/bank" + customdistr "github.com/classic-terra/core/v2/custom/distribution" + customparams "github.com/classic-terra/core/v2/custom/params" + customstaking "github.com/classic-terra/core/v2/custom/staking" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market" + marketkeeper "github.com/classic-terra/core/v2/x/market/keeper" + markettypes "github.com/classic-terra/core/v2/x/market/types" + "github.com/classic-terra/core/v2/x/oracle" + oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + "github.com/classic-terra/core/v2/x/treasury/types" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/secp256k1" diff --git a/x/treasury/legacy/v05/migrate.go b/x/treasury/legacy/v05/migrate.go index f95963f44..d221bff37 100644 --- a/x/treasury/legacy/v05/migrate.go +++ b/x/treasury/legacy/v05/migrate.go @@ -3,8 +3,8 @@ package v05 import ( "sort" - v04treasury "github.com/classic-terra/core/x/treasury/legacy/v04" - v05treasury "github.com/classic-terra/core/x/treasury/types" + v04treasury "github.com/classic-terra/core/v2/x/treasury/legacy/v04" + v05treasury "github.com/classic-terra/core/v2/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/treasury/legacy/v05/migrate_test.go b/x/treasury/legacy/v05/migrate_test.go index 73155886f..637dabb04 100644 --- a/x/treasury/legacy/v05/migrate_test.go +++ b/x/treasury/legacy/v05/migrate_test.go @@ -10,10 +10,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/app" - core "github.com/classic-terra/core/types" - v04treasury "github.com/classic-terra/core/x/treasury/legacy/v04" - v05treasury "github.com/classic-terra/core/x/treasury/legacy/v05" + "github.com/classic-terra/core/v2/app" + core "github.com/classic-terra/core/v2/types" + v04treasury "github.com/classic-terra/core/v2/x/treasury/legacy/v04" + v05treasury "github.com/classic-terra/core/v2/x/treasury/legacy/v05" ) func TestMigrate(t *testing.T) { diff --git a/x/treasury/module.go b/x/treasury/module.go index 16df23855..018278f27 100644 --- a/x/treasury/module.go +++ b/x/treasury/module.go @@ -6,8 +6,8 @@ import ( "fmt" "math/rand" - "github.com/classic-terra/core/x/treasury/keeper" - "github.com/classic-terra/core/x/treasury/simulation" + "github.com/classic-terra/core/v2/x/treasury/keeper" + "github.com/classic-terra/core/v2/x/treasury/simulation" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/gorilla/mux" @@ -22,9 +22,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/classic-terra/core/x/treasury/client/cli" - "github.com/classic-terra/core/x/treasury/client/rest" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/client/cli" + "github.com/classic-terra/core/v2/x/treasury/client/rest" + "github.com/classic-terra/core/v2/x/treasury/types" ) var ( diff --git a/x/treasury/proposal_handler.go b/x/treasury/proposal_handler.go index fcc299db6..b05ddff9b 100644 --- a/x/treasury/proposal_handler.go +++ b/x/treasury/proposal_handler.go @@ -1,8 +1,8 @@ package treasury import ( - "github.com/classic-terra/core/x/treasury/keeper" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/keeper" + "github.com/classic-terra/core/v2/x/treasury/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" diff --git a/x/treasury/simulation/decoder.go b/x/treasury/simulation/decoder.go index 2ae0d2246..1f1e994fa 100644 --- a/x/treasury/simulation/decoder.go +++ b/x/treasury/simulation/decoder.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/treasury/simulation/decoder_test.go b/x/treasury/simulation/decoder_test.go index d1fe24e2d..8be8d55f1 100644 --- a/x/treasury/simulation/decoder_test.go +++ b/x/treasury/simulation/decoder_test.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/keeper" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/keeper" + "github.com/classic-terra/core/v2/x/treasury/types" ) func TestDecodeDistributionStore(t *testing.T) { diff --git a/x/treasury/simulation/genesis.go b/x/treasury/simulation/genesis.go index ee170a941..5c910d004 100644 --- a/x/treasury/simulation/genesis.go +++ b/x/treasury/simulation/genesis.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) // Simulation parameter constants diff --git a/x/treasury/simulation/params.go b/x/treasury/simulation/params.go index a4313dd59..a23419298 100644 --- a/x/treasury/simulation/params.go +++ b/x/treasury/simulation/params.go @@ -10,7 +10,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/classic-terra/core/x/treasury/types" + "github.com/classic-terra/core/v2/x/treasury/types" ) // ParamChanges defines the parameters that can be modified by param change proposals diff --git a/x/treasury/types/exptected_keepers.go b/x/treasury/types/exptected_keepers.go index 99b375e60..86d27fc75 100644 --- a/x/treasury/types/exptected_keepers.go +++ b/x/treasury/types/exptected_keepers.go @@ -5,7 +5,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - oracletypes "github.com/classic-terra/core/x/oracle/types" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" ) // AccountKeeper expected account keeper diff --git a/x/treasury/types/params.go b/x/treasury/types/params.go index 9174321ab..5bdf497dd 100644 --- a/x/treasury/types/params.go +++ b/x/treasury/types/params.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" ) // Parameter keys diff --git a/x/treasury/wasm/interface.go b/x/treasury/wasm/interface.go index 5bffa78b1..c7b49d64a 100644 --- a/x/treasury/wasm/interface.go +++ b/x/treasury/wasm/interface.go @@ -8,9 +8,9 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - "github.com/classic-terra/core/x/treasury/keeper" - "github.com/classic-terra/core/x/treasury/types" - wasm "github.com/classic-terra/core/x/wasm/exported" + "github.com/classic-terra/core/v2/x/treasury/keeper" + "github.com/classic-terra/core/v2/x/treasury/types" + wasm "github.com/classic-terra/core/v2/x/wasm/exported" ) var _ wasm.WasmQuerierInterface = Querier{} diff --git a/x/treasury/wasm/interface_test.go b/x/treasury/wasm/interface_test.go index c404af67b..06febe1d3 100644 --- a/x/treasury/wasm/interface_test.go +++ b/x/treasury/wasm/interface_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/treasury/keeper" - "github.com/classic-terra/core/x/treasury/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/treasury/keeper" + "github.com/classic-terra/core/v2/x/treasury/types" ) func TestQueryTaxRate(t *testing.T) { diff --git a/x/vesting/module.go b/x/vesting/module.go index f6da73130..8b296daf6 100644 --- a/x/vesting/module.go +++ b/x/vesting/module.go @@ -12,7 +12,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/classic-terra/core/x/vesting/types" + "github.com/classic-terra/core/v2/x/vesting/types" ) var _ module.AppModuleBasic = AppModuleBasic{} diff --git a/x/vesting/types/common_test.go b/x/vesting/types/common_test.go index 616ca4e2f..9b6833d06 100644 --- a/x/vesting/types/common_test.go +++ b/x/vesting/types/common_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" - "github.com/classic-terra/core/custom/auth" - "github.com/classic-terra/core/x/vesting/types" + "github.com/classic-terra/core/v2/custom/auth" + "github.com/classic-terra/core/v2/x/vesting/types" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/secp256k1" diff --git a/x/vesting/types/genesis_test.go b/x/vesting/types/genesis_test.go index 40224d7cc..e556ff7ec 100644 --- a/x/vesting/types/genesis_test.go +++ b/x/vesting/types/genesis_test.go @@ -10,8 +10,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" authvesttypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/vesting/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/vesting/types" ) var ( diff --git a/x/vesting/types/vesting_account_test.go b/x/vesting/types/vesting_account_test.go index e39b4a9f2..a645530ea 100644 --- a/x/vesting/types/vesting_account_test.go +++ b/x/vesting/types/vesting_account_test.go @@ -14,8 +14,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" authvestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/vesting/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/vesting/types" ) var ( diff --git a/x/wasm/client/cli/query.go b/x/wasm/client/cli/query.go index 7272a5305..4a4a994b9 100644 --- a/x/wasm/client/cli/query.go +++ b/x/wasm/client/cli/query.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" ) // GetQueryCmd returns the cli query commands for wasm module diff --git a/x/wasm/client/cli/tx.go b/x/wasm/client/cli/tx.go index bbaf41f58..730095afd 100644 --- a/x/wasm/client/cli/tx.go +++ b/x/wasm/client/cli/tx.go @@ -15,9 +15,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - feeutils "github.com/classic-terra/core/custom/auth/client/utils" - wasmUtils "github.com/classic-terra/core/x/wasm/client/utils" - "github.com/classic-terra/core/x/wasm/types" + feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" + wasmUtils "github.com/classic-terra/core/v2/x/wasm/client/utils" + "github.com/classic-terra/core/v2/x/wasm/types" ) const ( diff --git a/x/wasm/client/rest/query.go b/x/wasm/client/rest/query.go index 445c010fc..422b34782 100644 --- a/x/wasm/client/rest/query.go +++ b/x/wasm/client/rest/query.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" "github.com/gorilla/mux" ) diff --git a/x/wasm/client/rest/tx.go b/x/wasm/client/rest/tx.go index cdae64fc7..0a71444fc 100644 --- a/x/wasm/client/rest/tx.go +++ b/x/wasm/client/rest/tx.go @@ -13,9 +13,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" - feeutils "github.com/classic-terra/core/custom/auth/client/utils" - wasmUtils "github.com/classic-terra/core/x/wasm/client/utils" - "github.com/classic-terra/core/x/wasm/types" + feeutils "github.com/classic-terra/core/v2/custom/auth/client/utils" + wasmUtils "github.com/classic-terra/core/v2/x/wasm/client/utils" + "github.com/classic-terra/core/v2/x/wasm/types" ) func registerTxRoutes(clientCtx client.Context, r *mux.Router) { diff --git a/x/wasm/common_test.go b/x/wasm/common_test.go index c20b685ff..4d675b641 100644 --- a/x/wasm/common_test.go +++ b/x/wasm/common_test.go @@ -15,7 +15,7 @@ import ( "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" ) var ( diff --git a/x/wasm/exported/alias.go b/x/wasm/exported/alias.go index 77c5c6cd4..3a602ce5c 100644 --- a/x/wasm/exported/alias.go +++ b/x/wasm/exported/alias.go @@ -1,6 +1,6 @@ package exported -import "github.com/classic-terra/core/x/wasm/types" +import "github.com/classic-terra/core/v2/x/wasm/types" var ( EncodeSdkCoin = types.EncodeSdkCoin diff --git a/x/wasm/genesis.go b/x/wasm/genesis.go index 022a33c63..e6b4aca57 100644 --- a/x/wasm/genesis.go +++ b/x/wasm/genesis.go @@ -3,8 +3,8 @@ package wasm import ( "bytes" - "github.com/classic-terra/core/x/wasm/keeper" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/keeper" + "github.com/classic-terra/core/v2/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/wasm/genesis_test.go b/x/wasm/genesis_test.go index ec151b144..bfa8aab7f 100644 --- a/x/wasm/genesis_test.go +++ b/x/wasm/genesis_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/wasm" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/keeper" - "github.com/classic-terra/core/x/wasm/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/wasm" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/keeper" + "github.com/classic-terra/core/v2/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/wasm/handler.go b/x/wasm/handler.go index d37f19832..5f1794caa 100644 --- a/x/wasm/handler.go +++ b/x/wasm/handler.go @@ -8,8 +8,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/classic-terra/core/x/wasm/keeper" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/keeper" + "github.com/classic-terra/core/v2/x/wasm/types" ) // NewHandler returns a handler for "wasm" type messages. diff --git a/x/wasm/handler_test.go b/x/wasm/handler_test.go index 49c34f1f5..71b5fd876 100644 --- a/x/wasm/handler_test.go +++ b/x/wasm/handler_test.go @@ -5,16 +5,16 @@ import ( "strconv" "testing" - "github.com/classic-terra/core/x/wasm" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/keeper" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/keeper" + "github.com/classic-terra/core/v2/x/wasm/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" + core "github.com/classic-terra/core/v2/types" ) func TestHandleStore(t *testing.T) { diff --git a/x/wasm/keeper/api.go b/x/wasm/keeper/api.go index 83b0a5523..a3c2c3d29 100644 --- a/x/wasm/keeper/api.go +++ b/x/wasm/keeper/api.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" ) func (k Keeper) getCosmWasmAPI(ctx sdk.Context) cosmwasm.GoAPI { diff --git a/x/wasm/keeper/bench_test.go b/x/wasm/keeper/bench_test.go index a8b620eaf..097bfcb11 100644 --- a/x/wasm/keeper/bench_test.go +++ b/x/wasm/keeper/bench_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/classic-terra/core/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/config" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -15,7 +15,7 @@ import ( // Just this function is copied from // https://github.com/cosmos/cosmos-sdk/blob/90e9370bd80d9a3d41f7203ddb71166865561569/crypto/keys/internal/benchmarking/bench.go#L48-L62 // And thus under the GO license (BSD style) -// go test -benchmem -run=^$ -bench ^BenchmarkGasNormalization$ github.com/classic-terra/core/x/wasm/keeper +// go test -benchmem -run=^$ -bench ^BenchmarkGasNormalization$ github.com/classic-terra/core/v2/x/wasm/keeper func BenchmarkGasNormalization(b *testing.B) { priv := secp256k1.GenPrivKey() pub := priv.PubKey() @@ -35,7 +35,7 @@ func BenchmarkGasNormalization(b *testing.B) { // By comparing the timing for queries on pinned vs unpinned, the difference gives us the overhead of // instantiating an unpinned contract. That value can be used to determine a reasonable gas price // for the InstantiationCost -// go test -benchmem -run=^$ -bench ^BenchmarkInstantiationOverhead$ github.com/classic-terra/core/x/wasm/keeper +// go test -benchmem -run=^$ -bench ^BenchmarkInstantiationOverhead$ github.com/classic-terra/core/v2/x/wasm/keeper func BenchmarkInstantiationOverhead(b *testing.B) { specs := map[string]struct { pinned bool @@ -71,7 +71,7 @@ func BenchmarkInstantiationOverhead(b *testing.B) { // Calculate the time it takes to compile some wasm code the first time. // This will help us adjust pricing for StoreCode -// go test -benchmem -run=^$ -bench ^BenchmarkCompilation$ github.com/classic-terra/core/x/wasm/keeper +// go test -benchmem -run=^$ -bench ^BenchmarkCompilation$ github.com/classic-terra/core/v2/x/wasm/keeper // run stat -f%z x/wasm/keeper/testdata/hackatom.wasm to get byte size of wasm file func BenchmarkCompilation(b *testing.B) { specs := map[string]struct { diff --git a/x/wasm/keeper/connector.go b/x/wasm/keeper/connector.go index f29baaa5a..23408bae2 100644 --- a/x/wasm/keeper/connector.go +++ b/x/wasm/keeper/connector.go @@ -2,8 +2,8 @@ package keeper import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - "github.com/classic-terra/core/custom/auth/ante" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/custom/auth/ante" + "github.com/classic-terra/core/v2/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/wasm/keeper/contract.go b/x/wasm/keeper/contract.go index b37d17e5c..2dfd46285 100644 --- a/x/wasm/keeper/contract.go +++ b/x/wasm/keeper/contract.go @@ -6,7 +6,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" "github.com/cosmos/cosmos-sdk/store/prefix" "github.com/cosmos/cosmos-sdk/telemetry" diff --git a/x/wasm/keeper/contract_test.go b/x/wasm/keeper/contract_test.go index 3dcd1d289..07aeb401a 100644 --- a/x/wasm/keeper/contract_test.go +++ b/x/wasm/keeper/contract_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" ) func TestStoreCode(t *testing.T) { diff --git a/x/wasm/keeper/custom_test.go b/x/wasm/keeper/custom_test.go index 7c68a0714..85d2ccbd6 100644 --- a/x/wasm/keeper/custom_test.go +++ b/x/wasm/keeper/custom_test.go @@ -12,12 +12,12 @@ import ( "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/types" - marketwasm "github.com/classic-terra/core/x/market/wasm" - oraclewasm "github.com/classic-terra/core/x/oracle/wasm" - treasurywasm "github.com/classic-terra/core/x/treasury/wasm" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + core "github.com/classic-terra/core/v2/types" + marketwasm "github.com/classic-terra/core/v2/x/market/wasm" + oraclewasm "github.com/classic-terra/core/v2/x/oracle/wasm" + treasurywasm "github.com/classic-terra/core/v2/x/treasury/wasm" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" ) // MakerInitMsg nolint diff --git a/x/wasm/keeper/ioutil.go b/x/wasm/keeper/ioutil.go index 59912ef5a..6d8be75d4 100644 --- a/x/wasm/keeper/ioutil.go +++ b/x/wasm/keeper/ioutil.go @@ -5,7 +5,7 @@ import ( "compress/gzip" "io" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" ) // magic bytes to identify gzip. diff --git a/x/wasm/keeper/ioutil_test.go b/x/wasm/keeper/ioutil_test.go index ccab78c93..7f2441946 100644 --- a/x/wasm/keeper/ioutil_test.go +++ b/x/wasm/keeper/ioutil_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/x/wasm/keeper/keeper.go b/x/wasm/keeper/keeper.go index 8bcc59353..8789adc3e 100644 --- a/x/wasm/keeper/keeper.go +++ b/x/wasm/keeper/keeper.go @@ -15,8 +15,8 @@ import ( wasmvm "github.com/CosmWasm/wasmvm" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" ) // Keeper will have a reference to Wasmer with it's own data directory. diff --git a/x/wasm/keeper/keeper_test.go b/x/wasm/keeper/keeper_test.go index 3c1d1e819..b60aaf0cf 100644 --- a/x/wasm/keeper/keeper_test.go +++ b/x/wasm/keeper/keeper_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/wasm/keeper/legacy_querier.go b/x/wasm/keeper/legacy_querier.go index 0188ad65f..ab6cca585 100644 --- a/x/wasm/keeper/legacy_querier.go +++ b/x/wasm/keeper/legacy_querier.go @@ -10,7 +10,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" ) // NewLegacyQuerier creates a new querier diff --git a/x/wasm/keeper/legacy_querier_test.go b/x/wasm/keeper/legacy_querier_test.go index 6ecd18f4f..8ac81e433 100644 --- a/x/wasm/keeper/legacy_querier_test.go +++ b/x/wasm/keeper/legacy_querier_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" "github.com/stretchr/testify/require" diff --git a/x/wasm/keeper/msg_server.go b/x/wasm/keeper/msg_server.go index 36654b1b4..1d1f5f376 100644 --- a/x/wasm/keeper/msg_server.go +++ b/x/wasm/keeper/msg_server.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/wasm/keeper/msg_server_test.go b/x/wasm/keeper/msg_server_test.go index 79719a9d8..1276bead0 100644 --- a/x/wasm/keeper/msg_server_test.go +++ b/x/wasm/keeper/msg_server_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/wasm/keeper/params.go b/x/wasm/keeper/params.go index 7508762be..de9b21d6a 100644 --- a/x/wasm/keeper/params.go +++ b/x/wasm/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/wasm/keeper/querier.go b/x/wasm/keeper/querier.go index 20720de1e..a6b670378 100644 --- a/x/wasm/keeper/querier.go +++ b/x/wasm/keeper/querier.go @@ -5,7 +5,7 @@ import ( "fmt" "runtime/debug" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/wasm/keeper/querier_test.go b/x/wasm/keeper/querier_test.go index 420dedc1c..0ea376241 100644 --- a/x/wasm/keeper/querier_test.go +++ b/x/wasm/keeper/querier_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" "github.com/stretchr/testify/require" ) diff --git a/x/wasm/keeper/recursive_test.go b/x/wasm/keeper/recursive_test.go index f9da60dc1..4daa854d0 100644 --- a/x/wasm/keeper/recursive_test.go +++ b/x/wasm/keeper/recursive_test.go @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerror "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" ) type Recurse struct { @@ -95,7 +95,7 @@ func initRecurseContract(t *testing.T) (contract sdk.AccAddress, creator sdk.Acc return contractAddr, creator, ctx, keeper, cdc } -// go test -v -run ^TestGasCostOnQuery$ github.com/classic-terra/core/x/wasm/keeper +// go test -v -run ^TestGasCostOnQuery$ github.com/classic-terra/core/v2/x/wasm/keeper func TestGasCostOnQuery(t *testing.T) { GasNoWork := types.InstantiateContractCosts(0) + 3_602 // Note: about 100 SDK gas (10k wasmVM gas) for each round of sha256 @@ -254,7 +254,7 @@ func TestGasOnExternalQuery(t *testing.T) { } } -// go test -v -run ^TestLimitRecursiveQueryGas$ github.com/classic-terra/core/x/wasm/keeper +// go test -v -run ^TestLimitRecursiveQueryGas$ github.com/classic-terra/core/v2/x/wasm/keeper func TestLimitRecursiveQueryGas(t *testing.T) { // The point of this test from https://github.com/CosmWasm/cosmwasm/issues/456 // Basically, if I burn 90% of gas in CPU loop, then query out (to my self) diff --git a/x/wasm/keeper/reflect_test.go b/x/wasm/keeper/reflect_test.go index 08dcad2be..eb5be2ec0 100644 --- a/x/wasm/keeper/reflect_test.go +++ b/x/wasm/keeper/reflect_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/wasm/config" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/wasm/config" wasmvmtypes "github.com/CosmWasm/wasmvm/types" diff --git a/x/wasm/keeper/staking_test.go b/x/wasm/keeper/staking_test.go index 8888879f9..8b4c65309 100644 --- a/x/wasm/keeper/staking_test.go +++ b/x/wasm/keeper/staking_test.go @@ -23,8 +23,8 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/wasm/config" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/wasm/config" ) type StakingInitMsg struct { diff --git a/x/wasm/keeper/submsg_test.go b/x/wasm/keeper/submsg_test.go index 2745c6750..bb6fc6a40 100644 --- a/x/wasm/keeper/submsg_test.go +++ b/x/wasm/keeper/submsg_test.go @@ -14,9 +14,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" ) // test handing of submessages, very closely related to the reflect_test @@ -129,7 +129,7 @@ func TestDispatchSubMsgSuccessCase(t *testing.T) { }, module.Attributes[0]) } -// go test -v -run ^TestDispatchSubMsgErrorHandling$ github.com/classic-terra/core/x/wasm/keeper +// go test -v -run ^TestDispatchSubMsgErrorHandling$ github.com/classic-terra/core/v2/x/wasm/keeper func TestDispatchSubMsgErrorHandling(t *testing.T) { fundedDenom := core.MicroLunaDenom fundedAmount := 1_000_000 diff --git a/x/wasm/keeper/test_utils.go b/x/wasm/keeper/test_utils.go index 157cd16ee..af248ee15 100644 --- a/x/wasm/keeper/test_utils.go +++ b/x/wasm/keeper/test_utils.go @@ -42,29 +42,29 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - customauth "github.com/classic-terra/core/custom/auth" - custombank "github.com/classic-terra/core/custom/bank" - bankwasm "github.com/classic-terra/core/custom/bank/wasm" - customdistr "github.com/classic-terra/core/custom/distribution" - distrwasm "github.com/classic-terra/core/custom/distribution/wasm" - govwasm "github.com/classic-terra/core/custom/gov/wasm" - customparams "github.com/classic-terra/core/custom/params" - customstaking "github.com/classic-terra/core/custom/staking" - stakingwasm "github.com/classic-terra/core/custom/staking/wasm" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/market" - marketkeeper "github.com/classic-terra/core/x/market/keeper" - markettypes "github.com/classic-terra/core/x/market/types" - marketwasm "github.com/classic-terra/core/x/market/wasm" - "github.com/classic-terra/core/x/oracle" - oraclekeeper "github.com/classic-terra/core/x/oracle/keeper" - oracletypes "github.com/classic-terra/core/x/oracle/types" - oraclewasm "github.com/classic-terra/core/x/oracle/wasm" - treasurykeeper "github.com/classic-terra/core/x/treasury/keeper" - treasurytypes "github.com/classic-terra/core/x/treasury/types" - treasurywasm "github.com/classic-terra/core/x/treasury/wasm" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + customauth "github.com/classic-terra/core/v2/custom/auth" + custombank "github.com/classic-terra/core/v2/custom/bank" + bankwasm "github.com/classic-terra/core/v2/custom/bank/wasm" + customdistr "github.com/classic-terra/core/v2/custom/distribution" + distrwasm "github.com/classic-terra/core/v2/custom/distribution/wasm" + govwasm "github.com/classic-terra/core/v2/custom/gov/wasm" + customparams "github.com/classic-terra/core/v2/custom/params" + customstaking "github.com/classic-terra/core/v2/custom/staking" + stakingwasm "github.com/classic-terra/core/v2/custom/staking/wasm" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/market" + marketkeeper "github.com/classic-terra/core/v2/x/market/keeper" + markettypes "github.com/classic-terra/core/v2/x/market/types" + marketwasm "github.com/classic-terra/core/v2/x/market/wasm" + "github.com/classic-terra/core/v2/x/oracle" + oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper" + oracletypes "github.com/classic-terra/core/v2/x/oracle/types" + oraclewasm "github.com/classic-terra/core/v2/x/oracle/wasm" + treasurykeeper "github.com/classic-terra/core/v2/x/treasury/keeper" + treasurytypes "github.com/classic-terra/core/v2/x/treasury/types" + treasurywasm "github.com/classic-terra/core/v2/x/treasury/wasm" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" ) const faucetAccountName = "faucet" diff --git a/x/wasm/keeper/wasm_interface.go b/x/wasm/keeper/wasm_interface.go index ae59b8e0d..7a8b47c04 100644 --- a/x/wasm/keeper/wasm_interface.go +++ b/x/wasm/keeper/wasm_interface.go @@ -8,7 +8,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" ) var ( diff --git a/x/wasm/keeper/wasm_interface_stargate.go b/x/wasm/keeper/wasm_interface_stargate.go index 5f8d9dc12..2ec5e52f5 100644 --- a/x/wasm/keeper/wasm_interface_stargate.go +++ b/x/wasm/keeper/wasm_interface_stargate.go @@ -12,7 +12,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" ) var ( diff --git a/x/wasm/keeper/wasm_interface_test.go b/x/wasm/keeper/wasm_interface_test.go index 4afe73de9..5b29a0512 100644 --- a/x/wasm/keeper/wasm_interface_test.go +++ b/x/wasm/keeper/wasm_interface_test.go @@ -13,9 +13,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/wasm/config" - "github.com/classic-terra/core/x/wasm/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/wasm/config" + "github.com/classic-terra/core/v2/x/wasm/types" ) func TestEcoding(t *testing.T) { diff --git a/x/wasm/legacy/v05/migrate.go b/x/wasm/legacy/v05/migrate.go index 891317093..1c06b863c 100644 --- a/x/wasm/legacy/v05/migrate.go +++ b/x/wasm/legacy/v05/migrate.go @@ -1,8 +1,8 @@ package v05 import ( - v04wasm "github.com/classic-terra/core/x/wasm/legacy/v04" - v05wasm "github.com/classic-terra/core/x/wasm/types" + v04wasm "github.com/classic-terra/core/v2/x/wasm/legacy/v04" + v05wasm "github.com/classic-terra/core/v2/x/wasm/types" ) // Migrate accepts exported v0.4 x/wasm and diff --git a/x/wasm/legacy/v05/migrate_test.go b/x/wasm/legacy/v05/migrate_test.go index e7eeffc89..1634c4279 100644 --- a/x/wasm/legacy/v05/migrate_test.go +++ b/x/wasm/legacy/v05/migrate_test.go @@ -11,10 +11,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/classic-terra/core/app" - core "github.com/classic-terra/core/types" - v04wasm "github.com/classic-terra/core/x/wasm/legacy/v04" - v05wasm "github.com/classic-terra/core/x/wasm/legacy/v05" + "github.com/classic-terra/core/v2/app" + core "github.com/classic-terra/core/v2/types" + v04wasm "github.com/classic-terra/core/v2/x/wasm/legacy/v04" + v05wasm "github.com/classic-terra/core/v2/x/wasm/legacy/v05" ) func TestMigrate(t *testing.T) { diff --git a/x/wasm/module.go b/x/wasm/module.go index 160b96a93..3ee69fa7f 100644 --- a/x/wasm/module.go +++ b/x/wasm/module.go @@ -20,11 +20,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/classic-terra/core/x/wasm/client/cli" - "github.com/classic-terra/core/x/wasm/client/rest" - "github.com/classic-terra/core/x/wasm/keeper" - "github.com/classic-terra/core/x/wasm/simulation" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/client/cli" + "github.com/classic-terra/core/v2/x/wasm/client/rest" + "github.com/classic-terra/core/v2/x/wasm/keeper" + "github.com/classic-terra/core/v2/x/wasm/simulation" + "github.com/classic-terra/core/v2/x/wasm/types" ) var ( diff --git a/x/wasm/simulation/decoder.go b/x/wasm/simulation/decoder.go index 6d502acf3..1072e2030 100644 --- a/x/wasm/simulation/decoder.go +++ b/x/wasm/simulation/decoder.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/wasm/simulation/decoder_test.go b/x/wasm/simulation/decoder_test.go index 31cc5f183..c80160f20 100644 --- a/x/wasm/simulation/decoder_test.go +++ b/x/wasm/simulation/decoder_test.go @@ -12,8 +12,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/classic-terra/core/x/wasm/keeper" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/keeper" + "github.com/classic-terra/core/v2/x/wasm/types" ) var ( diff --git a/x/wasm/simulation/genesis.go b/x/wasm/simulation/genesis.go index 0a8a9e0b0..4f4609dcb 100644 --- a/x/wasm/simulation/genesis.go +++ b/x/wasm/simulation/genesis.go @@ -7,7 +7,7 @@ import ( "fmt" "math/rand" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" "github.com/cosmos/cosmos-sdk/types/module" ) diff --git a/x/wasm/simulation/operations.go b/x/wasm/simulation/operations.go index 5b05982d8..5adf65e71 100644 --- a/x/wasm/simulation/operations.go +++ b/x/wasm/simulation/operations.go @@ -15,9 +15,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - core "github.com/classic-terra/core/types" - "github.com/classic-terra/core/x/wasm/keeper" - "github.com/classic-terra/core/x/wasm/types" + core "github.com/classic-terra/core/v2/types" + "github.com/classic-terra/core/v2/x/wasm/keeper" + "github.com/classic-terra/core/v2/x/wasm/types" ) const ( diff --git a/x/wasm/simulation/params.go b/x/wasm/simulation/params.go index 45fd6ece4..bcb26c610 100644 --- a/x/wasm/simulation/params.go +++ b/x/wasm/simulation/params.go @@ -9,7 +9,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/classic-terra/core/x/wasm/types" + "github.com/classic-terra/core/v2/x/wasm/types" ) // ParamChanges defines the parameters that can be modified by param change proposals