Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

chore!: v20 Namespace #958

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Resolve Errors
joelsmith-2019 committed Feb 2, 2024
commit a5bf7a05c64540604493ea9456fda11793c7d10e
1 change: 1 addition & 0 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -70,6 +70,7 @@ import (
testnetV18alpha2 "github.com/CosmosContracts/juno/v20/app/upgrades/testnet/v18.0.0-alpha.2"
testnetV18alpha3 "github.com/CosmosContracts/juno/v20/app/upgrades/testnet/v18.0.0-alpha.3"
testnetV18alpha4 "github.com/CosmosContracts/juno/v20/app/upgrades/testnet/v18.0.0-alpha.4"
testnetV19alpha3 "github.com/CosmosContracts/juno/v20/app/upgrades/testnet/v19.0.0-alpha.3"
v10 "github.com/CosmosContracts/juno/v20/app/upgrades/v10"
v11 "github.com/CosmosContracts/juno/v20/app/upgrades/v11"
v12 "github.com/CosmosContracts/juno/v20/app/upgrades/v12"
8 changes: 4 additions & 4 deletions app/upgrades/testnet/v19.0.0-alpha.3/constants.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v18
package v19

import (
"fmt"
@@ -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/v19/app/keepers"
"github.com/CosmosContracts/juno/v19/app/upgrades"
clocktypes "github.com/CosmosContracts/juno/v19/x/clock/types"
"github.com/CosmosContracts/juno/v20/app/keepers"
"github.com/CosmosContracts/juno/v20/app/upgrades"
clocktypes "github.com/CosmosContracts/juno/v20/x/clock/types"
)

// UpgradeName defines the on-chain upgrade name for the upgrade.
6 changes: 3 additions & 3 deletions app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package v18_test
package v19_test

import (
"testing"

"github.com/stretchr/testify/suite"

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

type UpgradeTestSuite struct {
2 changes: 1 addition & 1 deletion app/upgrades/v19/mainnet_account.go
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import (
vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil"

"github.com/CosmosContracts/juno/v19/app/keepers"
"github.com/CosmosContracts/juno/v20/app/keepers"
)

const (
2 changes: 2 additions & 0 deletions app/upgrades/v19/upgrades.go
Original file line number Diff line number Diff line change
@@ -16,6 +16,8 @@ import (
decorators "github.com/CosmosContracts/juno/v20/app/decorators"
"github.com/CosmosContracts/juno/v20/app/keepers"
"github.com/CosmosContracts/juno/v20/app/upgrades"

clocktypes "github.com/CosmosContracts/juno/v20/x/clock/types"
)

func CreateV19UpgradeHandler(
2 changes: 2 additions & 0 deletions x/clock/keeper/clock.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,9 @@
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/query"

"github.com/CosmosContracts/juno/v20/x/clock/types"

Check failure on line 8 in x/clock/keeper/clock.go

GitHub Actions / lint

File is not `gci`-ed with --skip-generated -s standard -s default -s blank -s dot -s prefix(github.com/cometbft/cometbft) -s prefix(github.com/cosmos) -s prefix(cosmossdk.io) -s prefix(github.com/cosmos/cosmos-sdk) -s prefix(github.com/CosmosContracts/juno) --custom-order (gci)

globalerrors "github.com/CosmosContracts/juno/v20/app/helpers"
)

// Store Keys for clock contracts (both jailed and unjailed)
2 changes: 2 additions & 0 deletions x/clock/keeper/querier.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,9 @@

sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/CosmosContracts/juno/v20/x/clock/types"

Check failure on line 8 in x/clock/keeper/querier.go

GitHub Actions / lint

File is not `gci`-ed with --skip-generated -s standard -s default -s blank -s dot -s prefix(github.com/cometbft/cometbft) -s prefix(github.com/cosmos) -s prefix(cosmossdk.io) -s prefix(github.com/cosmos/cosmos-sdk) -s prefix(github.com/CosmosContracts/juno) --custom-order (gci)

globalerrors "github.com/CosmosContracts/juno/v20/app/helpers"

Check failure on line 10 in x/clock/keeper/querier.go

GitHub Actions / lint

File is not `gci`-ed with --skip-generated -s standard -s default -s blank -s dot -s prefix(github.com/cometbft/cometbft) -s prefix(github.com/cosmos) -s prefix(cosmossdk.io) -s prefix(github.com/cosmos/cosmos-sdk) -s prefix(github.com/CosmosContracts/juno) --custom-order (gci)
)

var _ types.QueryServer = &Querier{}
2 changes: 1 addition & 1 deletion x/clock/types/msgs.go
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

globalerrors "github.com/CosmosContracts/juno/v19/app/helpers"
globalerrors "github.com/CosmosContracts/juno/v20/app/helpers"
)

const (
2 changes: 1 addition & 1 deletion x/cw-hooks/keeper/contracts.go
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import (
"github.com/cosmos/cosmos-sdk/store/prefix"
sdk "github.com/cosmos/cosmos-sdk/types"

helpers "github.com/CosmosContracts/juno/v19/app/helpers"
helpers "github.com/CosmosContracts/juno/v20/app/helpers"
)

func (k Keeper) SetContract(ctx sdk.Context, keyPrefix []byte, contractAddr sdk.AccAddress) {
2 changes: 2 additions & 0 deletions x/feepay/keeper/feepay.go
Original file line number Diff line number Diff line change
@@ -10,6 +10,8 @@ import (
"github.com/cosmos/cosmos-sdk/types/query"

"github.com/CosmosContracts/juno/v20/x/feepay/types"

globalerrors "github.com/CosmosContracts/juno/v20/app/helpers"
)

// Check if a contract is registered as a fee pay contract
2 changes: 2 additions & 0 deletions x/feepay/keeper/msg_server.go
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@ import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"

"github.com/CosmosContracts/juno/v20/x/feepay/types"

globalerrors "github.com/CosmosContracts/juno/v20/app/helpers"
)

var _ types.MsgServer = &Keeper{}
2 changes: 2 additions & 0 deletions x/feepay/keeper/querier.go
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/CosmosContracts/juno/v20/x/feepay/types"

globalerrors "github.com/CosmosContracts/juno/v20/app/helpers"
)

var _ types.QueryServer = Querier{}