Skip to content

Commit

Permalink
Resolve Errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@joelsmith-2019
joelsmith-2019 committed Feb 2, 2024
1 parent 70236ea commit a5bf7a0
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 10 deletions.
1 change: 1 addition & 0 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/testnet/v19.0.0-alpha.3/constants.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v18
package v19

import (
"fmt"
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go
View file
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 {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v19/mainnet_account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 2 additions & 0 deletions app/upgrades/v19/upgrades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 2 additions & 0 deletions x/clock/keeper/clock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"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

View workflow job for this annotation

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)
Expand Down
2 changes: 2 additions & 0 deletions x/clock/keeper/querier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
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

View workflow job for this annotation

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

View workflow job for this annotation

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{}
Expand Down
2 changes: 1 addition & 1 deletion x/clock/types/msgs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion x/cw-hooks/keeper/contracts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions x/feepay/keeper/feepay.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions x/feepay/keeper/msg_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
2 changes: 2 additions & 0 deletions x/feepay/keeper/querier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down

0 comments on commit a5bf7a0

Please sign in to comment.