Skip to content

Commit 4cb0957

Browse files
authored
Merge branch 'main' into foundation_cli
2 parents 794e211 + 5ed82db commit 4cb0957

File tree

3 files changed

+32
-1
lines changed

3 files changed

+32
-1
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
106106
* (x/foundation) [\#712](https://github.com/line/lbm-sdk/pull/712) fix x/foundation EndBlocker
107107
* (baseapp) [\#724](https://github.com/line/lbm-sdk/pull/724) add checking pubkey type from validator params
108108
* (x/staking) [\#726](https://github.com/line/lbm-sdk/pull/726) check allowedList size in StakeAuthorization.Accept()
109+
* (x/staking) [\#728](https://github.com/line/lbm-sdk/pull/728) fix typo in unbondingToUnbonded() panic
109110
* (x/foundation) [\#732](https://github.com/line/lbm-sdk/pull/732) add verification on accounts into x/foundation Grants cli
110111

111112
### Breaking Changes

x/staking/keeper/val_state_change.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func (k Keeper) unbondedToBonded(ctx sdk.Context, validator types.Validator) (ty
249249
// UnbondingToUnbonded switches a validator from unbonding state to unbonded state
250250
func (k Keeper) UnbondingToUnbonded(ctx sdk.Context, validator types.Validator) types.Validator {
251251
if !validator.IsUnbonding() {
252-
panic(fmt.Sprintf("bad state transition unbondingToBonded, validator: %v\n", validator))
252+
panic(fmt.Sprintf("bad state transition unbondingToUnbonded, validator: %v\n", validator))
253253
}
254254

255255
return k.completeUnbondingValidator(ctx, validator)
+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package keeper_test
2+
3+
import (
4+
"github.com/line/lbm-sdk/x/staking/keeper"
5+
"github.com/line/lbm-sdk/x/staking/types"
6+
"github.com/stretchr/testify/assert"
7+
"github.com/stretchr/testify/require"
8+
"testing"
9+
)
10+
11+
func TestUnbondingToUnbondedPanic(t *testing.T) {
12+
app, ctx, _, _, validators := initValidators(t, 100, 2, []int64{0, 100})
13+
14+
for i, validator := range validators {
15+
validators[i] = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator, false)
16+
}
17+
18+
assert.Equal(t, validators[0].Status, types.Unbonded)
19+
assert.Equal(t, validators[1].Status, types.Bonded)
20+
21+
// unbond validator which is in unbonded status
22+
require.Panics(t, func() {
23+
app.StakingKeeper.UnbondingToUnbonded(ctx, validators[0])
24+
})
25+
26+
// unbond validator which is in bonded status
27+
require.Panics(t, func() {
28+
app.StakingKeeper.UnbondingToUnbonded(ctx, validators[1])
29+
})
30+
}

0 commit comments

Comments
 (0)