Skip to content

Commit

Permalink
Merge branch 'main' into patch-12
Browse files Browse the repository at this point in the history
  • Loading branch information
faddat authored Jul 8, 2024
2 parents e521859 + 386f90b commit 4c6b99a
Show file tree
Hide file tree
Showing 221 changed files with 684 additions and 672 deletions.
14 changes: 7 additions & 7 deletions app/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import (
govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"

decorators "github.com/CosmosContracts/juno/v22/app/decorators"
feepayante "github.com/CosmosContracts/juno/v22/x/feepay/ante"
feepaykeeper "github.com/CosmosContracts/juno/v22/x/feepay/keeper"
feeshareante "github.com/CosmosContracts/juno/v22/x/feeshare/ante"
feesharekeeper "github.com/CosmosContracts/juno/v22/x/feeshare/keeper"
globalfeeante "github.com/CosmosContracts/juno/v22/x/globalfee/ante"
globalfeekeeper "github.com/CosmosContracts/juno/v22/x/globalfee/keeper"
decorators "github.com/CosmosContracts/juno/v23/app/decorators"
feepayante "github.com/CosmosContracts/juno/v23/x/feepay/ante"
feepaykeeper "github.com/CosmosContracts/juno/v23/x/feepay/keeper"
feeshareante "github.com/CosmosContracts/juno/v23/x/feeshare/ante"
feesharekeeper "github.com/CosmosContracts/juno/v23/x/feeshare/keeper"
globalfeeante "github.com/CosmosContracts/juno/v23/x/globalfee/ante"
globalfeekeeper "github.com/CosmosContracts/juno/v23/x/globalfee/keeper"
)

// Lower back to 1 mil after https://github.com/cosmos/relayer/issues/1255
Expand Down
44 changes: 22 additions & 22 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,28 +64,28 @@ import (
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/CosmosContracts/juno/v22/app/keepers"
"github.com/CosmosContracts/juno/v22/app/openapiconsole"
upgrades "github.com/CosmosContracts/juno/v22/app/upgrades"
testnetV18alpha2 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v18.0.0-alpha.2"
testnetV18alpha3 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v18.0.0-alpha.3"
testnetV18alpha4 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v18.0.0-alpha.4"
testnetV19alpha3 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v19.0.0-alpha.3"
testnetV21alpha1 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v21.0.0-alpha.1"
testnetV22alpha1 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v22.0.0-alpha.1"
v10 "github.com/CosmosContracts/juno/v22/app/upgrades/v10"
v11 "github.com/CosmosContracts/juno/v22/app/upgrades/v11"
v12 "github.com/CosmosContracts/juno/v22/app/upgrades/v12"
v13 "github.com/CosmosContracts/juno/v22/app/upgrades/v13"
v14 "github.com/CosmosContracts/juno/v22/app/upgrades/v14"
v15 "github.com/CosmosContracts/juno/v22/app/upgrades/v15"
v16 "github.com/CosmosContracts/juno/v22/app/upgrades/v16"
v17 "github.com/CosmosContracts/juno/v22/app/upgrades/v17"
v18 "github.com/CosmosContracts/juno/v22/app/upgrades/v18"
v19 "github.com/CosmosContracts/juno/v22/app/upgrades/v19"
v21 "github.com/CosmosContracts/juno/v22/app/upgrades/v21"
v22 "github.com/CosmosContracts/juno/v22/app/upgrades/v22"
"github.com/CosmosContracts/juno/v22/docs"
"github.com/CosmosContracts/juno/v23/app/keepers"
"github.com/CosmosContracts/juno/v23/app/openapiconsole"
upgrades "github.com/CosmosContracts/juno/v23/app/upgrades"
testnetV18alpha2 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v18.0.0-alpha.2"
testnetV18alpha3 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v18.0.0-alpha.3"
testnetV18alpha4 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v18.0.0-alpha.4"
testnetV19alpha3 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v19.0.0-alpha.3"
testnetV21alpha1 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v21.0.0-alpha.1"
testnetV22alpha1 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v22.0.0-alpha.1"
v10 "github.com/CosmosContracts/juno/v23/app/upgrades/v10"
v11 "github.com/CosmosContracts/juno/v23/app/upgrades/v11"
v12 "github.com/CosmosContracts/juno/v23/app/upgrades/v12"
v13 "github.com/CosmosContracts/juno/v23/app/upgrades/v13"
v14 "github.com/CosmosContracts/juno/v23/app/upgrades/v14"
v15 "github.com/CosmosContracts/juno/v23/app/upgrades/v15"
v16 "github.com/CosmosContracts/juno/v23/app/upgrades/v16"
v17 "github.com/CosmosContracts/juno/v23/app/upgrades/v17"
v18 "github.com/CosmosContracts/juno/v23/app/upgrades/v18"
v19 "github.com/CosmosContracts/juno/v23/app/upgrades/v19"
v21 "github.com/CosmosContracts/juno/v23/app/upgrades/v21"
v22 "github.com/CosmosContracts/juno/v23/app/upgrades/v22"
"github.com/CosmosContracts/juno/v23/docs"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions app/apptesting/test_suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/CosmosContracts/juno/v22/app"
appparams "github.com/CosmosContracts/juno/v22/app/params"
"github.com/CosmosContracts/juno/v23/app"
appparams "github.com/CosmosContracts/juno/v23/app/params"
)

type KeeperTestHelper struct {
Expand Down
6 changes: 3 additions & 3 deletions app/decorators/change_rate_decorator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

"github.com/CosmosContracts/juno/v22/app"
decorators "github.com/CosmosContracts/juno/v22/app/decorators"
appparams "github.com/CosmosContracts/juno/v22/app/params"
"github.com/CosmosContracts/juno/v23/app"
decorators "github.com/CosmosContracts/juno/v23/app/decorators"
appparams "github.com/CosmosContracts/juno/v23/app/params"
)

// Define an empty ante handle
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package app
import (
"github.com/cosmos/cosmos-sdk/std"

"github.com/CosmosContracts/juno/v22/app/params"
"github.com/CosmosContracts/juno/v23/app/params"
)

// MakeEncodingConfig creates an EncodingConfig for testing
Expand Down
41 changes: 21 additions & 20 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,25 @@ import (
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

junoburn "github.com/CosmosContracts/juno/v22/x/burn"
clockkeeper "github.com/CosmosContracts/juno/v22/x/clock/keeper"
clocktypes "github.com/CosmosContracts/juno/v22/x/clock/types"
cwhookskeeper "github.com/CosmosContracts/juno/v22/x/cw-hooks/keeper"
cwhookstypes "github.com/CosmosContracts/juno/v22/x/cw-hooks/types"
dripkeeper "github.com/CosmosContracts/juno/v22/x/drip/keeper"
driptypes "github.com/CosmosContracts/juno/v22/x/drip/types"
feepaykeeper "github.com/CosmosContracts/juno/v22/x/feepay/keeper"
feepaytypes "github.com/CosmosContracts/juno/v22/x/feepay/types"
feesharekeeper "github.com/CosmosContracts/juno/v22/x/feeshare/keeper"
feesharetypes "github.com/CosmosContracts/juno/v22/x/feeshare/types"
"github.com/CosmosContracts/juno/v22/x/globalfee"
globalfeekeeper "github.com/CosmosContracts/juno/v22/x/globalfee/keeper"
globalfeetypes "github.com/CosmosContracts/juno/v22/x/globalfee/types"
mintkeeper "github.com/CosmosContracts/juno/v22/x/mint/keeper"
minttypes "github.com/CosmosContracts/juno/v22/x/mint/types"
"github.com/CosmosContracts/juno/v22/x/tokenfactory/bindings"
tokenfactorykeeper "github.com/CosmosContracts/juno/v22/x/tokenfactory/keeper"
tokenfactorytypes "github.com/CosmosContracts/juno/v22/x/tokenfactory/types"
junoburn "github.com/CosmosContracts/juno/v23/x/burn"
clockkeeper "github.com/CosmosContracts/juno/v23/x/clock/keeper"
clocktypes "github.com/CosmosContracts/juno/v23/x/clock/types"
cwhookskeeper "github.com/CosmosContracts/juno/v23/x/cw-hooks/keeper"
cwhookstypes "github.com/CosmosContracts/juno/v23/x/cw-hooks/types"
dripkeeper "github.com/CosmosContracts/juno/v23/x/drip/keeper"
driptypes "github.com/CosmosContracts/juno/v23/x/drip/types"
feepaykeeper "github.com/CosmosContracts/juno/v23/x/feepay/keeper"
feepaytypes "github.com/CosmosContracts/juno/v23/x/feepay/types"
feesharekeeper "github.com/CosmosContracts/juno/v23/x/feeshare/keeper"
feesharetypes "github.com/CosmosContracts/juno/v23/x/feeshare/types"
"github.com/CosmosContracts/juno/v23/x/globalfee"
globalfeekeeper "github.com/CosmosContracts/juno/v23/x/globalfee/keeper"
globalfeetypes "github.com/CosmosContracts/juno/v23/x/globalfee/types"
mintkeeper "github.com/CosmosContracts/juno/v23/x/mint/keeper"
minttypes "github.com/CosmosContracts/juno/v23/x/mint/types"
"github.com/CosmosContracts/juno/v23/x/tokenfactory/bindings"
tokenfactorykeeper "github.com/CosmosContracts/juno/v23/x/tokenfactory/keeper"
tokenfactorytypes "github.com/CosmosContracts/juno/v23/x/tokenfactory/types"
)

var (
Expand Down Expand Up @@ -429,12 +429,12 @@ func NewAppKeepers(
appKeepers.ICQKeeper = icqkeeper.NewKeeper(
appCodec,
appKeepers.keys[icqtypes.StoreKey],
appKeepers.GetSubspace(icqtypes.ModuleName),
appKeepers.IBCKeeper.ChannelKeeper, // may be replaced with middleware
appKeepers.IBCKeeper.ChannelKeeper,
&appKeepers.IBCKeeper.PortKeeper,
scopedICQKeeper,
bApp.GRPCQueryRouter(),
govModAddress,
)

appKeepers.ICAHostKeeper = icahostkeeper.NewKeeper(
Expand All @@ -448,6 +448,7 @@ func NewAppKeepers(
scopedICAHostKeeper,
bApp.MsgServiceRouter(),
)
appKeepers.ICAHostKeeper.WithQueryRouter(bApp.GRPCQueryRouter())

// ICA Controller keeper
appKeepers.ICAControllerKeeper = icacontrollerkeeper.NewKeeper(
Expand Down
16 changes: 8 additions & 8 deletions app/keepers/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

clocktypes "github.com/CosmosContracts/juno/v22/x/clock/types"
cwhookstypes "github.com/CosmosContracts/juno/v22/x/cw-hooks/types"
driptypes "github.com/CosmosContracts/juno/v22/x/drip/types"
feepaytypes "github.com/CosmosContracts/juno/v22/x/feepay/types"
feesharetypes "github.com/CosmosContracts/juno/v22/x/feeshare/types"
globalfeetypes "github.com/CosmosContracts/juno/v22/x/globalfee/types"
minttypes "github.com/CosmosContracts/juno/v22/x/mint/types"
tokenfactorytypes "github.com/CosmosContracts/juno/v22/x/tokenfactory/types"
clocktypes "github.com/CosmosContracts/juno/v23/x/clock/types"
cwhookstypes "github.com/CosmosContracts/juno/v23/x/cw-hooks/types"
driptypes "github.com/CosmosContracts/juno/v23/x/drip/types"
feepaytypes "github.com/CosmosContracts/juno/v23/x/feepay/types"
feesharetypes "github.com/CosmosContracts/juno/v23/x/feeshare/types"
globalfeetypes "github.com/CosmosContracts/juno/v23/x/globalfee/types"
minttypes "github.com/CosmosContracts/juno/v23/x/mint/types"
tokenfactorytypes "github.com/CosmosContracts/juno/v23/x/tokenfactory/types"
)

func (appKeepers *AppKeepers) GenerateKeys() {
Expand Down
32 changes: 16 additions & 16 deletions app/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

encparams "github.com/CosmosContracts/juno/v22/app/params"
"github.com/CosmosContracts/juno/v22/x/clock"
clocktypes "github.com/CosmosContracts/juno/v22/x/clock/types"
cwhooks "github.com/CosmosContracts/juno/v22/x/cw-hooks"
"github.com/CosmosContracts/juno/v22/x/drip"
driptypes "github.com/CosmosContracts/juno/v22/x/drip/types"
feepay "github.com/CosmosContracts/juno/v22/x/feepay"
feepaytypes "github.com/CosmosContracts/juno/v22/x/feepay/types"
feeshare "github.com/CosmosContracts/juno/v22/x/feeshare"
feesharetypes "github.com/CosmosContracts/juno/v22/x/feeshare/types"
"github.com/CosmosContracts/juno/v22/x/globalfee"
"github.com/CosmosContracts/juno/v22/x/mint"
minttypes "github.com/CosmosContracts/juno/v22/x/mint/types"
"github.com/CosmosContracts/juno/v22/x/tokenfactory"
tokenfactorytypes "github.com/CosmosContracts/juno/v22/x/tokenfactory/types"
encparams "github.com/CosmosContracts/juno/v23/app/params"
"github.com/CosmosContracts/juno/v23/x/clock"
clocktypes "github.com/CosmosContracts/juno/v23/x/clock/types"
cwhooks "github.com/CosmosContracts/juno/v23/x/cw-hooks"
"github.com/CosmosContracts/juno/v23/x/drip"
driptypes "github.com/CosmosContracts/juno/v23/x/drip/types"
feepay "github.com/CosmosContracts/juno/v23/x/feepay"
feepaytypes "github.com/CosmosContracts/juno/v23/x/feepay/types"
feeshare "github.com/CosmosContracts/juno/v23/x/feeshare"
feesharetypes "github.com/CosmosContracts/juno/v23/x/feeshare/types"
"github.com/CosmosContracts/juno/v23/x/globalfee"
"github.com/CosmosContracts/juno/v23/x/mint"
minttypes "github.com/CosmosContracts/juno/v23/x/mint/types"
"github.com/CosmosContracts/juno/v23/x/tokenfactory"
tokenfactorytypes "github.com/CosmosContracts/juno/v23/x/tokenfactory/types"
)

// ModuleBasics defines the module BasicManager is in charge of setting up basic,
Expand Down Expand Up @@ -169,7 +169,7 @@ func appModules(
cwhooks.NewAppModule(appCodec, app.AppKeepers.CWHooksKeeper),
// IBC modules
ibc_hooks.NewAppModule(app.AppKeepers.AccountKeeper),
icq.NewAppModule(app.AppKeepers.ICQKeeper),
icq.NewAppModule(app.AppKeepers.ICQKeeper, app.GetSubspace(icqtypes.ModuleName)),
packetforward.NewAppModule(app.AppKeepers.PacketForwardKeeper, app.GetSubspace(packetforwardtypes.ModuleName)),
wasmlc.NewAppModule(app.AppKeepers.WasmClientKeeper),
}
Expand Down
2 changes: 2 additions & 0 deletions app/openapiconsole/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"net/http"
)

// index.tpl is the template file for the OpenAPI console
//
//go:embed index.tpl
var index embed.FS

Expand Down
4 changes: 2 additions & 2 deletions app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

apphelpers "github.com/CosmosContracts/juno/v22/app/helpers"
appparams "github.com/CosmosContracts/juno/v22/app/params"
apphelpers "github.com/CosmosContracts/juno/v23/app/helpers"
appparams "github.com/CosmosContracts/juno/v23/app/params"
)

// SimAppChainID hardcoded chainID for simulation
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/testnet/v18.0.0-alpha.2/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v18
import (
store "github.com/cosmos/cosmos-sdk/store/types"

"github.com/CosmosContracts/juno/v22/app/upgrades"
"github.com/CosmosContracts/juno/v23/app/upgrades"
)

// UpgradeName defines the on-chain upgrade name for the upgrade.
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/v18.0.0-alpha.2/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/stretchr/testify/suite"

"github.com/CosmosContracts/juno/v22/app/apptesting"
v18alpha2 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v18.0.0-alpha.2"
"github.com/CosmosContracts/juno/v23/app/apptesting"
v18alpha2 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v18.0.0-alpha.2"
)

type UpgradeTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/testnet/v18.0.0-alpha.3/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v18
import (
store "github.com/cosmos/cosmos-sdk/store/types"

"github.com/CosmosContracts/juno/v22/app/upgrades"
"github.com/CosmosContracts/juno/v23/app/upgrades"
)

// UpgradeName defines the on-chain upgrade name for the upgrade.
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/v18.0.0-alpha.3/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/stretchr/testify/suite"

"github.com/CosmosContracts/juno/v22/app/apptesting"
v18alpha3 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v18.0.0-alpha.3"
"github.com/CosmosContracts/juno/v23/app/apptesting"
v18alpha3 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v18.0.0-alpha.3"
)

type UpgradeTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/testnet/v18.0.0-alpha.4/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v18
import (
store "github.com/cosmos/cosmos-sdk/store/types"

"github.com/CosmosContracts/juno/v22/app/upgrades"
"github.com/CosmosContracts/juno/v23/app/upgrades"
)

// UpgradeName defines the on-chain upgrade name for the upgrade.
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/v18.0.0-alpha.4/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/stretchr/testify/suite"

"github.com/CosmosContracts/juno/v22/app/apptesting"
v1800alpha4 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v18.0.0-alpha.4"
"github.com/CosmosContracts/juno/v23/app/apptesting"
v1800alpha4 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v18.0.0-alpha.4"
)

type UpgradeTestSuite struct {
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/testnet/v19.0.0-alpha.3/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/CosmosContracts/juno/v22/app/keepers"
"github.com/CosmosContracts/juno/v22/app/upgrades"
clocktypes "github.com/CosmosContracts/juno/v22/x/clock/types"
"github.com/CosmosContracts/juno/v23/app/keepers"
"github.com/CosmosContracts/juno/v23/app/upgrades"
clocktypes "github.com/CosmosContracts/juno/v23/x/clock/types"
)

// UpgradeName defines the on-chain upgrade name for the upgrade.
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/stretchr/testify/suite"

"github.com/CosmosContracts/juno/v22/app/apptesting"
v19alpha3 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v19.0.0-alpha.3"
"github.com/CosmosContracts/juno/v23/app/apptesting"
v19alpha3 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v19.0.0-alpha.3"
)

type UpgradeTestSuite struct {
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/v21.0.0-alpha.1/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/CosmosContracts/juno/v22/app/keepers"
"github.com/CosmosContracts/juno/v22/app/upgrades"
"github.com/CosmosContracts/juno/v23/app/keepers"
"github.com/CosmosContracts/juno/v23/app/upgrades"
)

// UpgradeName defines the on-chain upgrade name for the upgrade.
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/v21.0.0-alpha.1/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/stretchr/testify/suite"

"github.com/CosmosContracts/juno/v22/app/apptesting"
v19alpha3 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v19.0.0-alpha.3"
"github.com/CosmosContracts/juno/v23/app/apptesting"
v19alpha3 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v19.0.0-alpha.3"
)

type UpgradeTestSuite struct {
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/v22.0.0-alpha.1/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/CosmosContracts/juno/v22/app/keepers"
"github.com/CosmosContracts/juno/v22/app/upgrades"
"github.com/CosmosContracts/juno/v23/app/keepers"
"github.com/CosmosContracts/juno/v23/app/upgrades"
)

// UpgradeName defines the on-chain upgrade name for the upgrade.
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/testnet/v22.0.0-alpha.1/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/stretchr/testify/suite"

"github.com/CosmosContracts/juno/v22/app/apptesting"
v22alpha1 "github.com/CosmosContracts/juno/v22/app/upgrades/testnet/v22.0.0-alpha.1"
"github.com/CosmosContracts/juno/v23/app/apptesting"
v22alpha1 "github.com/CosmosContracts/juno/v23/app/upgrades/testnet/v22.0.0-alpha.1"
)

type UpgradeTestSuite struct {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/CosmosContracts/juno/v22/app/keepers"
"github.com/CosmosContracts/juno/v23/app/keepers"
)

// BaseAppParamManager defines an interrace that BaseApp is expected to fulfil
Expand Down
Loading

0 comments on commit 4c6b99a

Please sign in to comment.