chore(x/upgrade): Use cosmossdk.io/core/codec instead of `github.co…

…m/cosmos/cosmos-sdk/codec` (#23261) Co-authored-by: Marko <marko@baricevic.me> (cherry picked from commit ea78b3c) # Conflicts: # x/upgrade/depinject.go
cosmos · Jan 9, 2025 · ae40b89 · ae40b89
1 parent c0e94ff
commit ae40b89
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/x/upgrade/depinject.go b/x/upgrade/depinject.go
@@ -6,15 +6,19 @@ 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"
 
 	"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
@@ -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"