From 2ff654b81e634228d1b00b139be2f426dd8d14e5 Mon Sep 17 00:00:00 2001 From: Tuan Tran Date: Wed, 8 Jan 2025 23:12:55 +0700 Subject: [PATCH 1/4] bet --- x/upgrade/depinject.go | 2 +- x/upgrade/keeper/keeper.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x/upgrade/depinject.go b/x/upgrade/depinject.go index 9d385e224157..721ccf918dfd 100644 --- a/x/upgrade/depinject.go +++ b/x/upgrade/depinject.go @@ -12,8 +12,8 @@ import ( "cosmossdk.io/x/upgrade/keeper" "cosmossdk.io/x/upgrade/types" + "cosmossdk.io/core/codec" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go index a7e54a68dc6a..a1281b054637 100644 --- a/x/upgrade/keeper/keeper.go +++ b/x/upgrade/keeper/keeper.go @@ -20,7 +20,7 @@ import ( storetypes "cosmossdk.io/store/types" "cosmossdk.io/x/upgrade/types" - "github.com/cosmos/cosmos-sdk/codec" + "cosmossdk.io/core/codec" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/telemetry" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" From 786bcf68fda9d1f69e076c5059853cff2b17e3ce Mon Sep 17 00:00:00 2001 From: Tuan Tran Date: Thu, 9 Jan 2025 00:06:39 +0700 Subject: [PATCH 2/4] bet --- x/upgrade/keeper/abci_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/upgrade/keeper/abci_test.go b/x/upgrade/keeper/abci_test.go index 41cf9ebe94ed..abcb46db85dc 100644 --- a/x/upgrade/keeper/abci_test.go +++ b/x/upgrade/keeper/abci_test.go @@ -22,8 +22,8 @@ import ( upgradetestutil "cosmossdk.io/x/upgrade/testutil" "cosmossdk.io/x/upgrade/types" + addresscodec "cosmossdk.io/core/address" "github.com/cosmos/cosmos-sdk/baseapp" - addresscodec "github.com/cosmos/cosmos-sdk/codec/address" codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/testutil" From 89d7a4cb4c92be9cf9eb8f828ba385a1ba3d3a64 Mon Sep 17 00:00:00 2001 From: Tuan Tran Date: Thu, 9 Jan 2025 10:28:29 +0700 Subject: [PATCH 3/4] bet --- x/upgrade/keeper/abci_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/upgrade/keeper/abci_test.go b/x/upgrade/keeper/abci_test.go index abcb46db85dc..41cf9ebe94ed 100644 --- a/x/upgrade/keeper/abci_test.go +++ b/x/upgrade/keeper/abci_test.go @@ -22,8 +22,8 @@ import ( upgradetestutil "cosmossdk.io/x/upgrade/testutil" "cosmossdk.io/x/upgrade/types" - addresscodec "cosmossdk.io/core/address" "github.com/cosmos/cosmos-sdk/baseapp" + addresscodec "github.com/cosmos/cosmos-sdk/codec/address" codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/testutil" From 597187a08c67e3f6c0600bfb2bad08c5de501072 Mon Sep 17 00:00:00 2001 From: Tuan Tran Date: Thu, 9 Jan 2025 22:05:17 +0700 Subject: [PATCH 4/4] bet --- x/upgrade/depinject.go | 2 +- x/upgrade/keeper/keeper.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x/upgrade/depinject.go b/x/upgrade/depinject.go index 721ccf918dfd..6a2e51db916e 100644 --- a/x/upgrade/depinject.go +++ b/x/upgrade/depinject.go @@ -6,13 +6,13 @@ import ( modulev1 "cosmossdk.io/api/cosmos/upgrade/module/v1" "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" + "cosmossdk.io/core/codec" coreserver "cosmossdk.io/core/server" "cosmossdk.io/depinject" "cosmossdk.io/depinject/appconfig" "cosmossdk.io/x/upgrade/keeper" "cosmossdk.io/x/upgrade/types" - "cosmossdk.io/core/codec" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/types/module" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go index a1281b054637..2a32f3957099 100644 --- a/x/upgrade/keeper/keeper.go +++ b/x/upgrade/keeper/keeper.go @@ -14,13 +14,13 @@ import ( "github.com/hashicorp/go-metrics" "cosmossdk.io/core/appmodule" + "cosmossdk.io/core/codec" "cosmossdk.io/core/server" errorsmod "cosmossdk.io/errors" "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" "cosmossdk.io/x/upgrade/types" - "cosmossdk.io/core/codec" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/telemetry" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"