From a5bf7a05c64540604493ea9456fda11793c7d10e Mon Sep 17 00:00:00 2001 From: Joel Smith Date: Fri, 2 Feb 2024 15:01:27 -0600 Subject: [PATCH] Resolve Errors --- app/app.go | 1 + app/upgrades/testnet/v19.0.0-alpha.3/constants.go | 8 ++++---- app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go | 6 +++--- app/upgrades/v19/mainnet_account.go | 2 +- app/upgrades/v19/upgrades.go | 2 ++ x/clock/keeper/clock.go | 2 ++ x/clock/keeper/querier.go | 2 ++ x/clock/types/msgs.go | 2 +- x/cw-hooks/keeper/contracts.go | 2 +- x/feepay/keeper/feepay.go | 2 ++ x/feepay/keeper/msg_server.go | 2 ++ x/feepay/keeper/querier.go | 2 ++ 12 files changed, 23 insertions(+), 10 deletions(-) diff --git a/app/app.go b/app/app.go index b4eef7c97..50804ab18 100644 --- a/app/app.go +++ b/app/app.go @@ -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" diff --git a/app/upgrades/testnet/v19.0.0-alpha.3/constants.go b/app/upgrades/testnet/v19.0.0-alpha.3/constants.go index 3b3f1aa29..a7c73761b 100644 --- a/app/upgrades/testnet/v19.0.0-alpha.3/constants.go +++ b/app/upgrades/testnet/v19.0.0-alpha.3/constants.go @@ -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. diff --git a/app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go b/app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go index a6c38e5cd..6be21f1d1 100644 --- a/app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go +++ b/app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go @@ -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 { diff --git a/app/upgrades/v19/mainnet_account.go b/app/upgrades/v19/mainnet_account.go index d337e4166..c74d4ac7b 100644 --- a/app/upgrades/v19/mainnet_account.go +++ b/app/upgrades/v19/mainnet_account.go @@ -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 ( diff --git a/app/upgrades/v19/upgrades.go b/app/upgrades/v19/upgrades.go index 4a4f3b79e..b3d37a1c3 100644 --- a/app/upgrades/v19/upgrades.go +++ b/app/upgrades/v19/upgrades.go @@ -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( diff --git a/x/clock/keeper/clock.go b/x/clock/keeper/clock.go index 2b609f4a3..5650d6213 100644 --- a/x/clock/keeper/clock.go +++ b/x/clock/keeper/clock.go @@ -6,6 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/CosmosContracts/juno/v20/x/clock/types" + + globalerrors "github.com/CosmosContracts/juno/v20/app/helpers" ) // Store Keys for clock contracts (both jailed and unjailed) diff --git a/x/clock/keeper/querier.go b/x/clock/keeper/querier.go index 5d0283a53..b08a29623 100644 --- a/x/clock/keeper/querier.go +++ b/x/clock/keeper/querier.go @@ -6,6 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/CosmosContracts/juno/v20/x/clock/types" + + globalerrors "github.com/CosmosContracts/juno/v20/app/helpers" ) var _ types.QueryServer = &Querier{} diff --git a/x/clock/types/msgs.go b/x/clock/types/msgs.go index 4f8569ecf..451737f77 100644 --- a/x/clock/types/msgs.go +++ b/x/clock/types/msgs.go @@ -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 ( diff --git a/x/cw-hooks/keeper/contracts.go b/x/cw-hooks/keeper/contracts.go index 421365f88..d2bfa832b 100644 --- a/x/cw-hooks/keeper/contracts.go +++ b/x/cw-hooks/keeper/contracts.go @@ -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) { diff --git a/x/feepay/keeper/feepay.go b/x/feepay/keeper/feepay.go index 1dcad4541..d0d8baede 100644 --- a/x/feepay/keeper/feepay.go +++ b/x/feepay/keeper/feepay.go @@ -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 diff --git a/x/feepay/keeper/msg_server.go b/x/feepay/keeper/msg_server.go index 663152d31..bcbf57e7e 100644 --- a/x/feepay/keeper/msg_server.go +++ b/x/feepay/keeper/msg_server.go @@ -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{} diff --git a/x/feepay/keeper/querier.go b/x/feepay/keeper/querier.go index a8f4dd5d0..b5d1a61f5 100644 --- a/x/feepay/keeper/querier.go +++ b/x/feepay/keeper/querier.go @@ -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{}