From 997bdc7e313899301acc8e084b6435e6bb73e1c7 Mon Sep 17 00:00:00 2001 From: Danilo Pantani Date: Fri, 30 Aug 2024 10:11:32 +0200 Subject: [PATCH] feat: use the TxConfig from simState instead create a new one (#4327) * use the TxConfig from simState instead create a new one * add changelog * add missing method parameters --- changelog.md | 1 + .../x/{{moduleName}}/simulation/{{msgName}}.go.plush | 1 + .../x/{{moduleName}}/simulation/{{typeName}}.go.plush | 9 ++++++--- .../x/{{moduleName}}/simulation/{{typeName}}.go.plush | 9 ++++++--- ignite/templates/typed/simapp.go | 4 ++-- .../x/{{moduleName}}/simulation/{{typeName}}.go.plush | 9 ++++++--- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/changelog.md b/changelog.md index 612805652e..024110c8f9 100644 --- a/changelog.md +++ b/changelog.md @@ -17,6 +17,7 @@ - [#4113](https://github.com/ignite/cli/pull/4113) Generate chain config documentation automatically - [#4131](https://github.com/ignite/cli/pull/4131) Support `bytes` as data type in the `scaffold` commands - [#4300](https://github.com/ignite/cli/pull/4300) Only panics the module in the most top function level +- [#4327](https://github.com/ignite/cli/pull/4327) Use the TxConfig from simState instead create a new one - [#4326](https://github.com/ignite/cli/pull/4326) fAdd `buf.build` version to `ignite version` command ### Changes diff --git a/ignite/templates/message/files/simapp/x/{{moduleName}}/simulation/{{msgName}}.go.plush b/ignite/templates/message/files/simapp/x/{{moduleName}}/simulation/{{msgName}}.go.plush index 8a574fca4e..90329dd141 100644 --- a/ignite/templates/message/files/simapp/x/{{moduleName}}/simulation/{{msgName}}.go.plush +++ b/ignite/templates/message/files/simapp/x/{{moduleName}}/simulation/{{msgName}}.go.plush @@ -14,6 +14,7 @@ func SimulateMsg<%= MsgName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { 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 2ef71cfb0b..09cce408e6 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 @@ -16,6 +16,7 @@ func SimulateMsgCreate<%= TypeName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { @@ -28,7 +29,7 @@ func SimulateMsgCreate<%= TypeName.UpperCamel %>( txCtx := simulation.OperationInput{ R: r, App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + TxGen: txGen, Cdc: nil, Msg: msg, Context: ctx, @@ -46,6 +47,7 @@ func SimulateMsgUpdate<%= TypeName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { @@ -81,7 +83,7 @@ func SimulateMsgUpdate<%= TypeName.UpperCamel %>( txCtx := simulation.OperationInput{ R: r, App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + TxGen: txGen, Cdc: nil, Msg: msg, Context: ctx, @@ -99,6 +101,7 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { @@ -134,7 +137,7 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>( txCtx := simulation.OperationInput{ R: r, App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + TxGen: txGen, Cdc: nil, Msg: msg, Context: ctx, diff --git a/ignite/templates/typed/map/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush b/ignite/templates/typed/map/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush index 4b6429fca8..17ea2a33bc 100644 --- a/ignite/templates/typed/map/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush +++ b/ignite/templates/typed/map/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush @@ -20,6 +20,7 @@ func SimulateMsgCreate<%= TypeName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { @@ -39,7 +40,7 @@ func SimulateMsgCreate<%= TypeName.UpperCamel %>( txCtx := simulation.OperationInput{ R: r, App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + TxGen: txGen, Cdc: nil, Msg: msg, Context: ctx, @@ -57,6 +58,7 @@ func SimulateMsgUpdate<%= TypeName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { @@ -92,7 +94,7 @@ func SimulateMsgUpdate<%= TypeName.UpperCamel %>( txCtx := simulation.OperationInput{ R: r, App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + TxGen: txGen, Cdc: nil, Msg: msg, Context: ctx, @@ -110,6 +112,7 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { @@ -145,7 +148,7 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>( txCtx := simulation.OperationInput{ R: r, App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + TxGen: txGen, Cdc: nil, Msg: msg, Context: ctx, diff --git a/ignite/templates/typed/simapp.go b/ignite/templates/typed/simapp.go index 2de6926d01..dd2458929b 100644 --- a/ignite/templates/typed/simapp.go +++ b/ignite/templates/typed/simapp.go @@ -37,7 +37,7 @@ func ModuleSimulationMsgModify( ) operations = append(operations, simulation.NewWeightedOperation( weightMsg%[2]v%[3]v, - %[4]vsimulation.SimulateMsg%[2]v%[3]v(am.accountKeeper, am.bankKeeper, am.keeper), + %[4]vsimulation.SimulateMsg%[2]v%[3]v(am.accountKeeper, am.bankKeeper, am.keeper, simState.TxConfig), )) %[1]v` @@ -49,7 +49,7 @@ func ModuleSimulationMsgModify( opWeightMsg%[2]v%[3]v, defaultWeightMsg%[2]v%[3]v, func(r *rand.Rand, ctx sdk.Context, accs []simtypes.Account) sdk.Msg { - %[4]vsimulation.SimulateMsg%[2]v%[3]v(am.accountKeeper, am.bankKeeper, am.keeper) + %[4]vsimulation.SimulateMsg%[2]v%[3]v(am.accountKeeper, am.bankKeeper, am.keeper, simState.TxConfig) return nil }, ), diff --git a/ignite/templates/typed/singleton/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush b/ignite/templates/typed/singleton/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush index a738688996..46c4b6fe1a 100644 --- a/ignite/templates/typed/singleton/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush +++ b/ignite/templates/typed/singleton/files/simapp/x/{{moduleName}}/simulation/{{typeName}}.go.plush @@ -18,6 +18,7 @@ func SimulateMsgCreate<%= TypeName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { @@ -35,7 +36,7 @@ func SimulateMsgCreate<%= TypeName.UpperCamel %>( txCtx := simulation.OperationInput{ R: r, App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + TxGen: txGen, Cdc: nil, Msg: msg, Context: ctx, @@ -53,6 +54,7 @@ func SimulateMsgUpdate<%= TypeName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { @@ -73,7 +75,7 @@ func SimulateMsgUpdate<%= TypeName.UpperCamel %>( txCtx := simulation.OperationInput{ R: r, App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + TxGen: txGen, Cdc: nil, Msg: msg, Context: ctx, @@ -91,6 +93,7 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>( ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, + txGen client.TxConfig, ) simtypes.Operation { return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { @@ -111,7 +114,7 @@ func SimulateMsgDelete<%= TypeName.UpperCamel %>( txCtx := simulation.OperationInput{ R: r, App: app, - TxGen: moduletestutil.MakeTestEncodingConfig().TxConfig, + TxGen: txGen, Cdc: nil, Msg: msg, Context: ctx,