LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor: remove .Type() and .Route() from msgs (#14751)

Browse Source
This commit is contained in:
Julien Robert
2023-01-24 17:03:06 +00:00
committed by GitHub
parent bc0386e996
commit 8dbdfea9ef
48 changed files with 409 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/simulation/event_stats.go
+6 -6
View File
@@ -17,18 +17,18 @@ func NewEventStats() EventStats {
}
// Tally increases the count of a simulation event.
func (es EventStats) Tally(route, op, evResult string) {
_, ok := es[route]
func (es EventStats) Tally(moduleName, op, evResult string) {
_, ok := es[moduleName]
if !ok {
es[route] = make(map[string]map[string]int)
es[moduleName] = make(map[string]map[string]int)
}
_, ok = es[route][op]
_, ok = es[moduleName][op]
if !ok {
es[route][op] = make(map[string]int)
es[moduleName][op] = make(map[string]int)
}
es[route][op][evResult]++
es[moduleName][op][evResult]++
}
// Print the event stats in JSON format.
x/simulation/util.go
+4 -5
View File
@@ -68,7 +68,6 @@ type OperationInput struct {
TxGen client.TxConfig
Cdc *codec.ProtoCodec
Msg sdk.Msg
MsgType string
CoinsSpentInMsg sdk.Coins
Context sdk.Context
SimAccount simtypes.Account
@@ -87,12 +86,12 @@ func GenAndDeliverTxWithRandFees(txCtx OperationInput) (simtypes.OperationMsg, [
coins, hasNeg := spendable.SafeSub(txCtx.CoinsSpentInMsg...)
if hasNeg {
return simtypes.NoOpMsg(txCtx.ModuleName, txCtx.MsgType, "message doesn't leave room for fees"), nil, err
return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "message doesn't leave room for fees"), nil, err
}
fees, err = simtypes.RandomFees(txCtx.R, txCtx.Context, coins)
if err != nil {
return simtypes.NoOpMsg(txCtx.ModuleName, txCtx.MsgType, "unable to generate fees"), nil, err
return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "unable to generate fees"), nil, err
}
return GenAndDeliverTx(txCtx, fees)
}
@@ -112,12 +111,12 @@ func GenAndDeliverTx(txCtx OperationInput, fees sdk.Coins) (simtypes.OperationMs
txCtx.SimAccount.PrivKey,
)
if err != nil {
return simtypes.NoOpMsg(txCtx.ModuleName, txCtx.MsgType, "unable to generate mock tx"), nil, err
return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "unable to generate mock tx"), nil, err
}
_, _, err = txCtx.App.SimDeliver(txCtx.TxGen.TxEncoder(), tx)
if err != nil {
return simtypes.NoOpMsg(txCtx.ModuleName, txCtx.MsgType, "unable to deliver tx"), nil, err
return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "unable to deliver tx"), nil, err
}
return simtypes.NewOperationMsg(txCtx.Msg, true, "", txCtx.Cdc), nil, nil