From ae40b89e1139b040db53dc79b860a7afc4dfaeff Mon Sep 17 00:00:00 2001 From: Tuan Tran Date: Fri, 10 Jan 2025 00:36:19 +0700 Subject: [PATCH 1/2] chore(x/upgrade): Use `cosmossdk.io/core/codec` instead of `github.com/cosmos/cosmos-sdk/codec` (#23261) Co-authored-by: Marko (cherry picked from commit ea78b3c5b52214578a23882d7d85f2a55e804fce) # Conflicts: # x/upgrade/depinject.go --- x/upgrade/depinject.go | 4 ++++ x/upgrade/keeper/keeper.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/x/upgrade/depinject.go b/x/upgrade/depinject.go index d12c0ea9a3b3..50165afbf04d 100644 --- a/x/upgrade/depinject.go +++ b/x/upgrade/depinject.go @@ -6,6 +6,7 @@ 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" @@ -13,8 +14,11 @@ import ( "cosmossdk.io/x/upgrade/types" "github.com/cosmos/cosmos-sdk/client/flags" +<<<<<<< HEAD "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" +======= +>>>>>>> ea78b3c5b (chore(x/upgrade): Use `cosmossdk.io/core/codec` instead of `github.com/cosmos/cosmos-sdk/codec` (#23261)) "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..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" - "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/telemetry" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" From 7081a5be28834dd9efb78ca3afbd33ad38f7ae9e Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 10 Jan 2025 09:31:18 +0100 Subject: [PATCH 2/2] conflicts --- x/upgrade/depinject.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/x/upgrade/depinject.go b/x/upgrade/depinject.go index 50165afbf04d..2bd08235d609 100644 --- a/x/upgrade/depinject.go +++ b/x/upgrade/depinject.go @@ -14,11 +14,7 @@ import ( "cosmossdk.io/x/upgrade/types" "github.com/cosmos/cosmos-sdk/client/flags" -<<<<<<< HEAD - "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" -======= ->>>>>>> ea78b3c5b (chore(x/upgrade): Use `cosmossdk.io/core/codec` instead of `github.com/cosmos/cosmos-sdk/codec` (#23261)) "github.com/cosmos/cosmos-sdk/types/module" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" )