From 49c9ce081cea828c4f3ce72caa16afd6e7728fab Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Mon, 23 Dec 2024 12:46:11 +0100 Subject: [PATCH] fix conflicts --- UPGRADING.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/UPGRADING.md b/UPGRADING.md index ebc3f000ecda..9d9061b70e70 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -12,11 +12,7 @@ It is additional to the changes described here. In this section we describe the changes made in Cosmos SDK' SimApp. **These changes are directly applicable to your application wiring.** -<<<<<<< HEAD -Please read this section first, but for an exhaustive list of changes, refer to the [CHANGELOG](./simapp/CHANGELOG.md). -======= Please read this section first, but for an exhaustive list of changes, refer to the [CHANGELOG](https://github.com/cosmos/cosmos-sdk/blob/release/v0.52.x/simapp/CHANGELOG.md). ->>>>>>> 2596c7f6b (docs: fix dead link in `UPGRADING.md` (#23059)) #### Client (`root.go`) @@ -55,7 +51,7 @@ It can be removed from your `app.go`. For depinject users, it isn't necessary anymore to supply a `map[string]module.AppModuleBasic` for customizing the app module basic instantiation. The custom parameters (such as genutil message validator or gov proposal handler, or evidence handler) can directly be supplied. -When requiring a module manager in `root.go`, inject `*module.Manager` using `depinject.Inject`. +When requiring a module manager in `root.go`, inject `*module.Manager` using `depinject.Inject`. For non depinject users, simply call `RegisterLegacyAminoCodec` and `RegisterInterfaces` on the module manager: @@ -337,7 +333,7 @@ Core API has been introduced for modules since v0.47. With the deprecation of `s Additionally, the `appmodule.Environment` struct is introduced to fetch different services from the application. This should be used as an alternative to using `sdk.UnwrapContext(ctx)` to fetch the services. -It needs to be passed into a module at instantiation (or depinject will inject the correct environment). +It needs to be passed into a module at instantiation (or depinject will inject the correct environment). `x/circuit` is used as an example: @@ -419,7 +415,7 @@ Use `x/accounts` lockup accounts or implement an `x/accounts` vesting account in Accounts's AccountNumber will be used as a global account number tracking replacing Auth legacy AccountNumber. Must set accounts's AccountNumber with auth's AccountNumber value in upgrade handler. This is done through auth keeper MigrateAccountNumber function. ```go -import authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" +import authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" ... err := authkeeper.MigrateAccountNumberUnsafe(ctx, &app.AuthKeeper) if err != nil { @@ -446,7 +442,7 @@ import ( #### `x/crisis` -The `x/crisis` module was removed due to it not being supported or functional any longer. +The `x/crisis` module was removed due to it not being supported or functional any longer. #### `x/distribution`