From 37becbb3652fb173db5d0fcb0558049e645a34a9 Mon Sep 17 00:00:00 2001 From: KIMURA Yu <33382781+kimurayu45z@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:51:14 +0700 Subject: [PATCH 1/2] fix(templates): fix simapp simulation method update->delete (#4421) (cherry picked from commit da55a095652f3344c5afc91b83b18df90a565c19) # Conflicts: # ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush --- .../simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush b/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush index 2b4b871bd7..4c19eed973 100644 --- a/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush +++ b/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush @@ -96,8 +96,12 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>( var ( simAccount = simtypes.Account{} <%= TypeName.LowerCamel %> = types.<%= TypeName.UpperCamel %>{} +<<<<<<< HEAD msg = &types.MsgUpdate<%= TypeName.UpperCamel %>{} all<%= TypeName.UpperCamel %> = k.GetAll<%= TypeName.UpperCamel %>(ctx) +======= + msg = &types.MsgDelete<%= TypeName.UpperCamel %>{} +>>>>>>> da55a095 (fix(templates): fix simapp simulation method update->delete (#4421)) found = false ) for _, obj := range all<%= TypeName.UpperCamel %> { From db286650e904abe381b22383bf5ecb8b3209b1f2 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 22 Nov 2024 10:02:56 +0100 Subject: [PATCH 2/2] conflicts --- changelog.md | 6 +++++- .../x/{{moduleName}}/simulation/{{typeName}}.go.plush | 6 +----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changelog.md b/changelog.md index 237e133807..1fc764d16c 100644 --- a/changelog.md +++ b/changelog.md @@ -4,13 +4,17 @@ ### Features -- [#4377](https://github.com/ignite/cli/pull/4377) Add multi node (validator) testnet. +- [#4377](https://github.com/ignite/cli/pull/4377) Add multi node (validator) testnet - [#4362](https://github.com/ignite/cli/pull/4362) Scaffold `Makefile` ### Changes - [#4376](https://github.com/ignite/cli/pull/4376) Set different chain-id for in place testnet +### Bug Fixes + +- [#4421](https://github.com/ignite/cli/pull/4422) Fix typo in simulation template + ## [`v28.5.3`](https://github.com/ignite/cli/releases/tag/v28.5.3) ### Changes diff --git a/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush b/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush index 4c19eed973..5723b5b211 100644 --- a/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush +++ b/ignite/templates/typed/list/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush @@ -96,12 +96,8 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>( var ( simAccount = simtypes.Account{} <%= TypeName.LowerCamel %> = types.<%= TypeName.UpperCamel %>{} -<<<<<<< HEAD - msg = &types.MsgUpdate<%= TypeName.UpperCamel %>{} - all<%= TypeName.UpperCamel %> = k.GetAll<%= TypeName.UpperCamel %>(ctx) -======= msg = &types.MsgDelete<%= TypeName.UpperCamel %>{} ->>>>>>> da55a095 (fix(templates): fix simapp simulation method update->delete (#4421)) + all<%= TypeName.UpperCamel %> = k.GetAll<%= TypeName.UpperCamel %>(ctx) found = false ) for _, obj := range all<%= TypeName.UpperCamel %> {