From b0652195d814bd34f7fd9923a089a8fd3b57299f Mon Sep 17 00:00:00 2001 From: Alexander Peters Date: Fri, 19 Jul 2024 15:30:09 +0200 Subject: [PATCH] test(x/slashing): fix slashing sims (#20995) --- x/slashing/simulation/operations.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/x/slashing/simulation/operations.go b/x/slashing/simulation/operations.go index 7dce1d3451..45f61af3a9 100644 --- a/x/slashing/simulation/operations.go +++ b/x/slashing/simulation/operations.go @@ -93,16 +93,9 @@ func SimulateMsgUnjail( if err != nil { return simtypes.NoOpMsg(types.ModuleName, msgType, "unable to get validator consensus key"), nil, err } - info, err := k.ValidatorSigningInfo.Get(ctx, consAddr) - if err != nil { - return simtypes.NoOpMsg(types.ModuleName, msgType, "unable to find validator signing info"), nil, err // skip - } - - selfDel, err := sk.Delegation(ctx, simAccount.Address, bz) - if err != nil { - return simtypes.NoOpMsg(types.ModuleName, msgType, "unable to get self delegation"), nil, err - } + info, _ := k.ValidatorSigningInfo.Get(ctx, consAddr) + selfDel, _ := sk.Delegation(ctx, simAccount.Address, bz) if selfDel == nil { return simtypes.NoOpMsg(types.ModuleName, msgType, "self delegation is nil"), nil, nil // skip } @@ -112,7 +105,7 @@ func SimulateMsgUnjail( fees, err := simtypes.RandomFees(r, spendable) if err != nil { - return simtypes.NoOpMsg(types.ModuleName, msgType, "unable to generate fees"), nil, err + return simtypes.NoOpMsg(types.ModuleName, msgType, "unable to generate fees"), nil, nil } msg := types.NewMsgUnjail(validator.GetOperator()) @@ -140,6 +133,7 @@ func SimulateMsgUnjail( // - self delegation too low if info.Tombstoned || ctx.HeaderInfo().Time.Before(info.JailedUntil) || + selfDel.GetShares().IsNil() || validator.TokensFromShares(selfDel.GetShares()).TruncateInt().LT(validator.GetMinSelfDelegation()) { if res != nil && err == nil { if info.Tombstoned { @@ -148,7 +142,8 @@ func SimulateMsgUnjail( if ctx.HeaderInfo().Time.Before(info.JailedUntil) { return simtypes.NewOperationMsg(msg, true, ""), nil, errors.New("validator unjailed while validator still in jail period") } - if validator.TokensFromShares(selfDel.GetShares()).TruncateInt().LT(validator.GetMinSelfDelegation()) { + if selfDel.GetShares().IsNil() || + validator.TokensFromShares(selfDel.GetShares()).TruncateInt().LT(validator.GetMinSelfDelegation()) { return simtypes.NewOperationMsg(msg, true, ""), nil, errors.New("validator unjailed even though self-delegation too low") } }