refactor(x/staking)!: removing unbonding queue index (#22795)

2024-12-16 10:48:54 +00:00
parent 2c2249ffd3
commit 234cdc45f2
27 changed files with 1127 additions and 2508 deletions
@@ -552,7 +552,7 @@ func TestGRPCValidatorUnbondingDelegations(t *testing.T) {
 		ValidatorAddr: validator.OperatorAddress,
 	}

-	testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.ValidatorUnbondingDelegations, 3719, false)
+	testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.ValidatorUnbondingDelegations, 3707, false)
 }

 func TestGRPCDelegation(t *testing.T) {
@@ -632,7 +632,7 @@ func TestGRPCUnbondingDelegation(t *testing.T) {
 		DelegatorAddr: delegator1,
 	}

-	testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.UnbondingDelegation, 1621, false)
+	testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.UnbondingDelegation, 1615, false)
 }

 func TestGRPCDelegatorDelegations(t *testing.T) {
@@ -755,7 +755,7 @@ func TestGRPCDelegatorUnbondingDelegations(t *testing.T) {
 		DelegatorAddr: delegator1,
 	}

-	testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorUnbondingDelegations, 1302, false)
+	testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.DelegatorUnbondingDelegations, 1290, false)
 }

 func TestGRPCDelegatorValidators(t *testing.T) {
@@ -875,7 +875,7 @@ func TestGRPCRedelegations(t *testing.T) {
 		DstValidatorAddr: validator2,
 	}

-	testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Redelegations, 3926, false)
+	testdata.DeterministicIterations(t, f.ctx, req, f.queryClient.Redelegations, 3920, false)
 }

 func TestGRPCParams(t *testing.T) {
@@ -58,7 +58,6 @@ func TestCancelUnbondingDelegation(t *testing.T) {
 		delegatorAddr, validatorAddr, 10,
 		ctx.HeaderInfo().Time.Add(time.Minute*10),
 		unbondingAmount.Amount,
-		0,
 		address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"),
 	)

@@ -79,7 +79,7 @@ func TestSlashUnbondingDelegation(t *testing.T) {
 	// set an unbonding delegation with expiration timestamp (beyond which the
 	// unbonding delegation shouldn't be slashed)
 	ubd := types.NewUnbondingDelegation(addrDels[0], addrVals[0], 0,
-		time.Unix(5, 0), math.NewInt(10), 0, address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
+		time.Unix(5, 0), math.NewInt(10), address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))

 	assert.NilError(t, f.stakingKeeper.SetUnbondingDelegation(f.sdkCtx, ubd))

@@ -138,7 +138,7 @@ func TestSlashRedelegation(t *testing.T) {
 	// set a redelegation with an expiration timestamp beyond which the
 	// redelegation shouldn't be slashed
 	rd := types.NewRedelegation(addrDels[0], addrVals[0], addrVals[1], 0,
-		time.Unix(5, 0), math.NewInt(10), math.LegacyNewDec(10), 0, address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
+		time.Unix(5, 0), math.NewInt(10), math.LegacyNewDec(10), address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))

 	assert.NilError(t, f.stakingKeeper.SetRedelegation(f.sdkCtx, rd))

@@ -285,7 +285,7 @@ func TestSlashWithUnbondingDelegation(t *testing.T) {
 	// set an unbonding delegation with expiration timestamp beyond which the
 	// unbonding delegation shouldn't be slashed
 	ubdTokens := f.stakingKeeper.TokensFromConsensusPower(f.sdkCtx, 4)
-	ubd := types.NewUnbondingDelegation(addrDels[0], addrVals[0], 11, time.Unix(0, 0), ubdTokens, 0, address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
+	ubd := types.NewUnbondingDelegation(addrDels[0], addrVals[0], 11, time.Unix(0, 0), ubdTokens, address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
 	assert.NilError(t, f.stakingKeeper.SetUnbondingDelegation(f.sdkCtx, ubd))

 	// slash validator for the first time
@@ -415,7 +415,7 @@ func TestSlashWithRedelegation(t *testing.T) {

 	// set a redelegation
 	rdTokens := f.stakingKeeper.TokensFromConsensusPower(f.sdkCtx, 6)
-	rd := types.NewRedelegation(addrDels[0], addrVals[0], addrVals[1], 11, time.Unix(0, 0), rdTokens, math.LegacyNewDecFromInt(rdTokens), 0, address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
+	rd := types.NewRedelegation(addrDels[0], addrVals[0], addrVals[1], 11, time.Unix(0, 0), rdTokens, math.LegacyNewDecFromInt(rdTokens), address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
 	assert.NilError(t, f.stakingKeeper.SetRedelegation(f.sdkCtx, rd))

 	// set the associated delegation
@@ -573,7 +573,7 @@ func TestSlashBoth(t *testing.T) {
 	// set a redelegation with expiration timestamp beyond which the
 	// redelegation shouldn't be slashed
 	rdATokens := f.stakingKeeper.TokensFromConsensusPower(f.sdkCtx, 6)
-	rdA := types.NewRedelegation(addrDels[0], addrVals[0], addrVals[1], 11, time.Unix(0, 0), rdATokens, math.LegacyNewDecFromInt(rdATokens), 0, address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
+	rdA := types.NewRedelegation(addrDels[0], addrVals[0], addrVals[1], 11, time.Unix(0, 0), rdATokens, math.LegacyNewDecFromInt(rdATokens), address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
 	assert.NilError(t, f.stakingKeeper.SetRedelegation(f.sdkCtx, rdA))

 	// set the associated delegation
@@ -584,7 +584,7 @@ func TestSlashBoth(t *testing.T) {
 	// unbonding delegation shouldn't be slashed)
 	ubdATokens := f.stakingKeeper.TokensFromConsensusPower(f.sdkCtx, 4)
 	ubdA := types.NewUnbondingDelegation(addrDels[0], addrVals[0], 11,
-		time.Unix(0, 0), ubdATokens, 0, address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
+		time.Unix(0, 0), ubdATokens, address.NewBech32Codec("cosmosvaloper"), address.NewBech32Codec("cosmos"))
 	assert.NilError(t, f.stakingKeeper.SetUnbondingDelegation(f.sdkCtx, ubdA))

 	bondedCoins := sdk.NewCoins(sdk.NewCoin(bondDenom, rdATokens.MulRaw(2)))
@@ -1,460 +0,0 @@
-package keeper_test
-
-import (
-	"testing"
-	"time"
-
-	"go.uber.org/mock/gomock"
-	"gotest.tools/v3/assert"
-
-	"cosmossdk.io/core/header"
-	"cosmossdk.io/math"
-	banktestutil "cosmossdk.io/x/bank/testutil"
-	stakingkeeper "cosmossdk.io/x/staking/keeper"
-	"cosmossdk.io/x/staking/testutil"
-	"cosmossdk.io/x/staking/types"
-
-	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-// SetupUnbondingTests creates two validators and setup mocked staking hooks for testing unbonding
-func SetupUnbondingTests(t *testing.T, f *fixture, hookCalled *bool, ubdeID *uint64) (bondDenom string, addrDels []sdk.AccAddress, addrVals []sdk.ValAddress) {
-	t.Helper()
-	// setup hooks
-	mockCtrl := gomock.NewController(t)
-	mockStackingHooks := testutil.NewMockStakingHooks(mockCtrl)
-	mockStackingHooks.EXPECT().AfterDelegationModified(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().AfterUnbondingInitiated(gomock.Any(), gomock.Any()).DoAndReturn(func(ctx sdk.Context, id uint64) error {
-		*hookCalled = true
-		// save id
-		*ubdeID = id
-		// call back to stop unbonding
-		err := f.stakingKeeper.PutUnbondingOnHold(f.sdkCtx, id)
-		assert.NilError(t, err)
-
-		return nil
-	}).AnyTimes()
-	mockStackingHooks.EXPECT().AfterValidatorBeginUnbonding(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().AfterValidatorBonded(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().AfterValidatorCreated(gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().AfterValidatorRemoved(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().BeforeDelegationCreated(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().BeforeDelegationRemoved(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().BeforeDelegationSharesModified(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().BeforeValidatorModified(gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().BeforeValidatorSlashed(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	mockStackingHooks.EXPECT().AfterConsensusPubKeyUpdate(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
-	f.stakingKeeper.SetHooks(types.NewMultiStakingHooks(mockStackingHooks))
-
-	addrDels = simtestutil.AddTestAddrsIncremental(f.bankKeeper, f.stakingKeeper, f.sdkCtx, 2, math.NewInt(10000))
-	addrVals = simtestutil.ConvertAddrsToValAddrs(addrDels)
-
-	valTokens := f.stakingKeeper.TokensFromConsensusPower(f.sdkCtx, 10)
-	startTokens := f.stakingKeeper.TokensFromConsensusPower(f.sdkCtx, 20)
-
-	bondDenom, err := f.stakingKeeper.BondDenom(f.sdkCtx)
-	assert.NilError(t, err)
-	notBondedPool := f.stakingKeeper.GetNotBondedPool(f.sdkCtx)
-
-	assert.NilError(t, banktestutil.FundModuleAccount(f.sdkCtx, f.bankKeeper, notBondedPool.GetName(), sdk.NewCoins(sdk.NewCoin(bondDenom, startTokens))))
-	f.accountKeeper.SetModuleAccount(f.sdkCtx, notBondedPool)
-
-	// Create a validator
-	validator1 := testutil.NewValidator(t, addrVals[0], PKs[0])
-	validator1, issuedShares1 := validator1.AddTokensFromDel(valTokens)
-	assert.DeepEqual(t, valTokens, issuedShares1.RoundInt())
-
-	validator1 = stakingkeeper.TestingUpdateValidator(f.stakingKeeper, f.sdkCtx, validator1, true)
-	assert.Assert(math.IntEq(t, valTokens, validator1.BondedTokens()))
-	assert.Assert(t, validator1.IsBonded())
-
-	// Create a delegator
-	delegation := types.NewDelegation(addrDels[0].String(), addrVals[0].String(), issuedShares1)
-	assert.NilError(t, f.stakingKeeper.SetDelegation(f.sdkCtx, delegation))
-
-	// Create a validator to redelegate to
-	validator2 := testutil.NewValidator(t, addrVals[1], PKs[1])
-	validator2, issuedShares2 := validator2.AddTokensFromDel(valTokens)
-	assert.DeepEqual(t, valTokens, issuedShares2.RoundInt())
-
-	validator2 = stakingkeeper.TestingUpdateValidator(f.stakingKeeper, f.sdkCtx, validator2, true)
-	assert.Equal(t, types.Bonded, validator2.Status)
-	assert.Assert(t, validator2.IsBonded())
-
-	return bondDenom, addrDels, addrVals
-}
-
-func doUnbondingDelegation(
-	t *testing.T,
-	stakingKeeper *stakingkeeper.Keeper,
-	bankKeeper types.BankKeeper,
-	ctx sdk.Context,
-	bondDenom string,
-	addrDels []sdk.AccAddress,
-	addrVals []sdk.ValAddress,
-	hookCalled *bool,
-) (completionTime time.Time, bondedAmt, notBondedAmt math.Int) {
-	t.Helper()
-	// UNDELEGATE
-	// Save original bonded and unbonded amounts
-	bondedAmt1 := bankKeeper.GetBalance(ctx, stakingKeeper.GetBondedPool(ctx).GetAddress(), bondDenom).Amount
-	notBondedAmt1 := bankKeeper.GetBalance(ctx, stakingKeeper.GetNotBondedPool(ctx).GetAddress(), bondDenom).Amount
-
-	var err error
-	undelegateAmount := math.LegacyNewDec(1)
-	completionTime, undelegatedAmount, err := stakingKeeper.Undelegate(ctx, addrDels[0], addrVals[0], undelegateAmount)
-	assert.NilError(t, err)
-	assert.Assert(t, undelegateAmount.Equal(math.LegacyNewDecFromInt(undelegatedAmount)))
-	// check that the unbonding actually happened
-	bondedAmt2 := bankKeeper.GetBalance(ctx, stakingKeeper.GetBondedPool(ctx).GetAddress(), bondDenom).Amount
-	notBondedAmt2 := bankKeeper.GetBalance(ctx, stakingKeeper.GetNotBondedPool(ctx).GetAddress(), bondDenom).Amount
-	// Bonded amount is less
-	assert.Assert(math.IntEq(t, bondedAmt1.SubRaw(1), bondedAmt2))
-	// Unbonded amount is more
-	assert.Assert(math.IntEq(t, notBondedAmt1.AddRaw(1), notBondedAmt2))
-
-	// Check that the unbonding happened- we look up the entry and see that it has the correct number of shares
-	unbondingDelegations, err := stakingKeeper.GetUnbondingDelegationsFromValidator(ctx, addrVals[0])
-	assert.NilError(t, err)
-	assert.DeepEqual(t, math.NewInt(1), unbondingDelegations[0].Entries[0].Balance)
-
-	// check that our hook was called
-	assert.Assert(t, *hookCalled)
-
-	return completionTime, bondedAmt2, notBondedAmt2
-}
-
-func doRedelegation(
-	t *testing.T,
-	stakingKeeper *stakingkeeper.Keeper,
-	ctx sdk.Context,
-	addrDels []sdk.AccAddress,
-	addrVals []sdk.ValAddress,
-	hookCalled *bool,
-) (completionTime time.Time) {
-	t.Helper()
-	var err error
-	completionTime, err = stakingKeeper.BeginRedelegation(ctx, addrDels[0], addrVals[0], addrVals[1], math.LegacyNewDec(1))
-	assert.NilError(t, err)
-
-	// Check that the redelegation happened- we look up the entry and see that it has the correct number of shares
-	redelegations, err := stakingKeeper.GetRedelegationsFromSrcValidator(ctx, addrVals[0])
-	assert.NilError(t, err)
-	assert.Equal(t, 1, len(redelegations))
-	assert.DeepEqual(t, math.LegacyNewDec(1), redelegations[0].Entries[0].SharesDst)
-
-	// check that our hook was called
-	assert.Assert(t, *hookCalled)
-
-	return completionTime
-}
-
-func doValidatorUnbonding(
-	t *testing.T,
-	stakingKeeper *stakingkeeper.Keeper,
-	ctx sdk.Context,
-	addrVal sdk.ValAddress,
-	hookCalled *bool,
-) (validator types.Validator) {
-	t.Helper()
-	validator, found := stakingKeeper.GetValidator(ctx, addrVal)
-	assert.Assert(t, found)
-	// Check that status is bonded
-	assert.Equal(t, types.BondStatus(3), validator.Status)
-
-	validator, err := stakingKeeper.BeginUnbondingValidator(ctx, validator)
-	assert.NilError(t, err)
-
-	// Check that status is unbonding
-	assert.Equal(t, types.BondStatus(2), validator.Status)
-
-	// check that our hook was called
-	assert.Assert(t, *hookCalled)
-
-	return validator
-}
-
-func TestValidatorUnbondingOnHold1(t *testing.T) {
-	t.Parallel()
-	f := initFixture(t)
-
-	var (
-		hookCalled bool
-		ubdeID     uint64
-	)
-
-	_, _, addrVals := SetupUnbondingTests(t, f, &hookCalled, &ubdeID)
-
-	// Start unbonding first validator
-	validator := doValidatorUnbonding(t, f.stakingKeeper, f.sdkCtx, addrVals[0], &hookCalled)
-
-	completionTime := validator.UnbondingTime
-	completionHeight := validator.UnbondingHeight
-
-	// CONSUMER CHAIN'S UNBONDING PERIOD ENDS - STOPPED UNBONDING CAN NOW COMPLETE
-	err := f.stakingKeeper.UnbondingCanComplete(f.sdkCtx, ubdeID)
-	assert.NilError(t, err)
-
-	// Try to unbond validator
-	assert.NilError(t, f.stakingKeeper.UnbondAllMatureValidators(f.sdkCtx))
-
-	// Check that validator unbonding is not complete (is not mature yet)
-	validator, found := f.stakingKeeper.GetValidator(f.sdkCtx, addrVals[0])
-	assert.Assert(t, found)
-	assert.Equal(t, types.Unbonding, validator.Status)
-	unbondingVals, err := f.stakingKeeper.GetUnbondingValidators(f.sdkCtx, completionTime, completionHeight)
-	assert.NilError(t, err)
-	assert.Equal(t, 1, len(unbondingVals))
-	assert.Equal(t, validator.OperatorAddress, unbondingVals[0])
-
-	// PROVIDER CHAIN'S UNBONDING PERIOD ENDS - BUT UNBONDING CANNOT COMPLETE
-	f.sdkCtx = f.sdkCtx.WithHeaderInfo(header.Info{Time: completionTime.Add(time.Duration(1))})
-	f.sdkCtx = f.sdkCtx.WithBlockHeight(completionHeight + 1)
-	assert.NilError(t, f.stakingKeeper.UnbondAllMatureValidators(f.sdkCtx))
-
-	// Check that validator unbonding is complete
-	validator, found = f.stakingKeeper.GetValidator(f.sdkCtx, addrVals[0])
-	assert.Assert(t, found)
-	assert.Equal(t, types.Unbonded, validator.Status)
-	unbondingVals, err = f.stakingKeeper.GetUnbondingValidators(f.sdkCtx, completionTime, completionHeight)
-	assert.NilError(t, err)
-	assert.Equal(t, 0, len(unbondingVals))
-}
-
-func TestValidatorUnbondingOnHold2(t *testing.T) {
-	t.Parallel()
-	f := initFixture(t)
-
-	var (
-		hookCalled bool
-		ubdeID     uint64
-		ubdeIDs    []uint64
-	)
-
-	_, _, addrVals := SetupUnbondingTests(t, f, &hookCalled, &ubdeID)
-
-	// Start unbonding first validator
-	validator1 := doValidatorUnbonding(t, f.stakingKeeper, f.sdkCtx, addrVals[0], &hookCalled)
-	ubdeIDs = append(ubdeIDs, ubdeID)
-
-	// Reset hookCalled flag
-	hookCalled = false
-
-	// Start unbonding second validator
-	validator2 := doValidatorUnbonding(t, f.stakingKeeper, f.sdkCtx, addrVals[1], &hookCalled)
-	ubdeIDs = append(ubdeIDs, ubdeID)
-
-	// Check that there are two unbonding operations
-	assert.Equal(t, 2, len(ubdeIDs))
-
-	// Check that both validators have same unbonding time
-	assert.Equal(t, validator1.UnbondingTime, validator2.UnbondingTime)
-
-	completionTime := validator1.UnbondingTime
-	completionHeight := validator1.UnbondingHeight
-
-	// PROVIDER CHAIN'S UNBONDING PERIOD ENDS - BUT UNBONDING CANNOT COMPLETE
-	f.sdkCtx = f.sdkCtx.WithHeaderInfo(header.Info{Time: completionTime.Add(time.Duration(1))})
-	f.sdkCtx = f.sdkCtx.WithBlockHeight(completionHeight + 1)
-	assert.NilError(t, f.stakingKeeper.UnbondAllMatureValidators(f.sdkCtx))
-
-	// Check that unbonding is not complete for both validators
-	validator1, found := f.stakingKeeper.GetValidator(f.sdkCtx, addrVals[0])
-	assert.Assert(t, found)
-	assert.Equal(t, types.Unbonding, validator1.Status)
-	validator2, found = f.stakingKeeper.GetValidator(f.sdkCtx, addrVals[1])
-	assert.Assert(t, found)
-	assert.Equal(t, types.Unbonding, validator2.Status)
-	unbondingVals, err := f.stakingKeeper.GetUnbondingValidators(f.sdkCtx, completionTime, completionHeight)
-	assert.NilError(t, err)
-	assert.Equal(t, 2, len(unbondingVals))
-	assert.Equal(t, validator1.OperatorAddress, unbondingVals[0])
-	assert.Equal(t, validator2.OperatorAddress, unbondingVals[1])
-
-	// CONSUMER CHAIN'S UNBONDING PERIOD ENDS - STOPPED UNBONDING CAN NOW COMPLETE
-	err = f.stakingKeeper.UnbondingCanComplete(f.sdkCtx, ubdeIDs[0])
-	assert.NilError(t, err)
-
-	// Try again to unbond validators
-	assert.NilError(t, f.stakingKeeper.UnbondAllMatureValidators(f.sdkCtx))
-
-	// Check that unbonding is complete for validator1, but not for validator2
-	validator1, found = f.stakingKeeper.GetValidator(f.sdkCtx, addrVals[0])
-	assert.Assert(t, found)
-	assert.Equal(t, types.Unbonded, validator1.Status)
-	validator2, found = f.stakingKeeper.GetValidator(f.sdkCtx, addrVals[1])
-	assert.Assert(t, found)
-	assert.Equal(t, types.Unbonding, validator2.Status)
-	unbondingVals, err = f.stakingKeeper.GetUnbondingValidators(f.sdkCtx, completionTime, completionHeight)
-	assert.NilError(t, err)
-	assert.Equal(t, 1, len(unbondingVals))
-	assert.Equal(t, validator2.OperatorAddress, unbondingVals[0])
-
-	// Unbonding for validator2 can complete
-	err = f.stakingKeeper.UnbondingCanComplete(f.sdkCtx, ubdeIDs[1])
-	assert.NilError(t, err)
-
-	// Try again to unbond validators
-	assert.NilError(t, f.stakingKeeper.UnbondAllMatureValidators(f.sdkCtx))
-
-	// Check that unbonding is complete for validator2
-	validator2, found = f.stakingKeeper.GetValidator(f.sdkCtx, addrVals[1])
-	assert.Assert(t, found)
-	assert.Equal(t, types.Unbonded, validator2.Status)
-	unbondingVals, err = f.stakingKeeper.GetUnbondingValidators(f.sdkCtx, completionTime, completionHeight)
-	assert.NilError(t, err)
-	assert.Equal(t, 0, len(unbondingVals))
-}
-
-func TestRedelegationOnHold1(t *testing.T) {
-	t.Parallel()
-	f := initFixture(t)
-
-	var (
-		hookCalled bool
-		ubdeID     uint64
-	)
-
-	// _, app, ctx := createTestInput(t)
-	_, addrDels, addrVals := SetupUnbondingTests(t, f, &hookCalled, &ubdeID)
-	completionTime := doRedelegation(t, f.stakingKeeper, f.sdkCtx, addrDels, addrVals, &hookCalled)
-
-	// CONSUMER CHAIN'S UNBONDING PERIOD ENDS - BUT UNBONDING CANNOT COMPLETE
-	err := f.stakingKeeper.UnbondingCanComplete(f.sdkCtx, ubdeID)
-	assert.NilError(t, err)
-
-	// Redelegation is not complete - still exists
-	redelegations, err := f.stakingKeeper.GetRedelegationsFromSrcValidator(f.sdkCtx, addrVals[0])
-	assert.NilError(t, err)
-	assert.Equal(t, 1, len(redelegations))
-
-	// PROVIDER CHAIN'S UNBONDING PERIOD ENDS - STOPPED UNBONDING CAN NOW COMPLETE
-	f.sdkCtx = f.sdkCtx.WithHeaderInfo(header.Info{Time: completionTime})
-	_, err = f.stakingKeeper.CompleteRedelegation(f.sdkCtx, addrDels[0], addrVals[0], addrVals[1])
-	assert.NilError(t, err)
-
-	// Redelegation is complete and record is gone
-	redelegations, err = f.stakingKeeper.GetRedelegationsFromSrcValidator(f.sdkCtx, addrVals[0])
-	assert.NilError(t, err)
-	assert.Equal(t, 0, len(redelegations))
-}
-
-func TestRedelegationOnHold2(t *testing.T) {
-	t.Parallel()
-	f := initFixture(t)
-
-	var (
-		hookCalled bool
-		ubdeID     uint64
-	)
-
-	// _, app, ctx := createTestInput(t)
-	_, addrDels, addrVals := SetupUnbondingTests(t, f, &hookCalled, &ubdeID)
-	completionTime := doRedelegation(t, f.stakingKeeper, f.sdkCtx, addrDels, addrVals, &hookCalled)
-
-	// PROVIDER CHAIN'S UNBONDING PERIOD ENDS - BUT UNBONDING CANNOT COMPLETE
-	f.sdkCtx = f.sdkCtx.WithHeaderInfo(header.Info{Time: completionTime})
-	_, err := f.stakingKeeper.CompleteRedelegation(f.sdkCtx, addrDels[0], addrVals[0], addrVals[1])
-	assert.NilError(t, err)
-
-	// Redelegation is not complete - still exists
-	redelegations, err := f.stakingKeeper.GetRedelegationsFromSrcValidator(f.sdkCtx, addrVals[0])
-	assert.NilError(t, err)
-	assert.Equal(t, 1, len(redelegations))
-
-	// CONSUMER CHAIN'S UNBONDING PERIOD ENDS - STOPPED UNBONDING CAN NOW COMPLETE
-	err = f.stakingKeeper.UnbondingCanComplete(f.sdkCtx, ubdeID)
-	assert.NilError(t, err)
-
-	// Redelegation is complete and record is gone
-	redelegations, err = f.stakingKeeper.GetRedelegationsFromSrcValidator(f.sdkCtx, addrVals[0])
-	assert.NilError(t, err)
-	assert.Equal(t, 0, len(redelegations))
-}
-
-func TestUnbondingDelegationOnHold1(t *testing.T) {
-	t.Parallel()
-	f := initFixture(t)
-
-	var (
-		hookCalled bool
-		ubdeID     uint64
-	)
-
-	// _, app, ctx := createTestInput(t)
-	bondDenom, addrDels, addrVals := SetupUnbondingTests(t, f, &hookCalled, &ubdeID)
-	for _, addr := range addrDels {
-		acc := f.accountKeeper.NewAccountWithAddress(f.sdkCtx, addr)
-		f.accountKeeper.SetAccount(f.sdkCtx, acc)
-	}
-	completionTime, bondedAmt1, notBondedAmt1 := doUnbondingDelegation(t, f.stakingKeeper, f.bankKeeper, f.sdkCtx, bondDenom, addrDels, addrVals, &hookCalled)
-
-	// CONSUMER CHAIN'S UNBONDING PERIOD ENDS - BUT UNBONDING CANNOT COMPLETE
-	err := f.stakingKeeper.UnbondingCanComplete(f.sdkCtx, ubdeID)
-	assert.NilError(t, err)
-
-	bondedAmt3 := f.bankKeeper.GetBalance(f.sdkCtx, f.stakingKeeper.GetBondedPool(f.sdkCtx).GetAddress(), bondDenom).Amount
-	notBondedAmt3 := f.bankKeeper.GetBalance(f.sdkCtx, f.stakingKeeper.GetNotBondedPool(f.sdkCtx).GetAddress(), bondDenom).Amount
-
-	// Bonded and unbonded amounts are the same as before because the completionTime has not yet passed and so the
-	// unbondingDelegation has not completed
-	assert.Assert(math.IntEq(t, bondedAmt1, bondedAmt3))
-	assert.Assert(math.IntEq(t, notBondedAmt1, notBondedAmt3))
-
-	// PROVIDER CHAIN'S UNBONDING PERIOD ENDS - STOPPED UNBONDING CAN NOW COMPLETE
-	f.sdkCtx = f.sdkCtx.WithHeaderInfo(header.Info{Time: completionTime})
-	_, err = f.stakingKeeper.CompleteUnbonding(f.sdkCtx, addrDels[0], addrVals[0])
-	assert.NilError(t, err)
-
-	// Check that the unbonding was finally completed
-	bondedAmt5 := f.bankKeeper.GetBalance(f.sdkCtx, f.stakingKeeper.GetBondedPool(f.sdkCtx).GetAddress(), bondDenom).Amount
-	notBondedAmt5 := f.bankKeeper.GetBalance(f.sdkCtx, f.stakingKeeper.GetNotBondedPool(f.sdkCtx).GetAddress(), bondDenom).Amount
-
-	assert.Assert(math.IntEq(t, bondedAmt1, bondedAmt5))
-	// Not bonded amount back to what it was originally
-	assert.Assert(math.IntEq(t, notBondedAmt1.SubRaw(1), notBondedAmt5))
-}
-
-func TestUnbondingDelegationOnHold2(t *testing.T) {
-	t.Parallel()
-	f := initFixture(t)
-
-	var (
-		hookCalled bool
-		ubdeID     uint64
-	)
-
-	// _, app, ctx := createTestInput(t)
-	bondDenom, addrDels, addrVals := SetupUnbondingTests(t, f, &hookCalled, &ubdeID)
-	for _, addr := range addrDels {
-		acc := f.accountKeeper.NewAccountWithAddress(f.sdkCtx, addr)
-		f.accountKeeper.SetAccount(f.sdkCtx, acc)
-	}
-	completionTime, bondedAmt1, notBondedAmt1 := doUnbondingDelegation(t, f.stakingKeeper, f.bankKeeper, f.sdkCtx, bondDenom, addrDels, addrVals, &hookCalled)
-
-	// PROVIDER CHAIN'S UNBONDING PERIOD ENDS - BUT UNBONDING CANNOT COMPLETE
-	f.sdkCtx = f.sdkCtx.WithHeaderInfo(header.Info{Time: completionTime})
-	_, err := f.stakingKeeper.CompleteUnbonding(f.sdkCtx, addrDels[0], addrVals[0])
-	assert.NilError(t, err)
-
-	bondedAmt3 := f.bankKeeper.GetBalance(f.sdkCtx, f.stakingKeeper.GetBondedPool(f.sdkCtx).GetAddress(), bondDenom).Amount
-	notBondedAmt3 := f.bankKeeper.GetBalance(f.sdkCtx, f.stakingKeeper.GetNotBondedPool(f.sdkCtx).GetAddress(), bondDenom).Amount
-
-	// Bonded and unbonded amounts are the same as before because the completionTime has not yet passed and so the
-	// unbondingDelegation has not completed
-	assert.Assert(math.IntEq(t, bondedAmt1, bondedAmt3))
-	assert.Assert(math.IntEq(t, notBondedAmt1, notBondedAmt3))
-
-	// CONSUMER CHAIN'S UNBONDING PERIOD ENDS - STOPPED UNBONDING CAN NOW COMPLETE
-	err = f.stakingKeeper.UnbondingCanComplete(f.sdkCtx, ubdeID)
-	assert.NilError(t, err)
-
-	// Check that the unbonding was finally completed
-	bondedAmt5 := f.bankKeeper.GetBalance(f.sdkCtx, f.stakingKeeper.GetBondedPool(f.sdkCtx).GetAddress(), bondDenom).Amount
-	notBondedAmt5 := f.bankKeeper.GetBalance(f.sdkCtx, f.stakingKeeper.GetNotBondedPool(f.sdkCtx).GetAddress(), bondDenom).Amount
-
-	assert.Assert(math.IntEq(t, bondedAmt1, bondedAmt5))
-	// Not bonded amount back to what it was originally
-	assert.Assert(math.IntEq(t, notBondedAmt1.SubRaw(1), notBondedAmt5))
-}