Skip to content

Commit 00c7756

Browse files
test(integration): port x/slashing tests to server v2 (#22754)
1 parent 66c593f commit 00c7756

File tree

7 files changed

+361
-569
lines changed

7 files changed

+361
-569
lines changed

tests/integration/slashing/app_config.go

-32
This file was deleted.

tests/integration/slashing/slashing_test.go

-119
This file was deleted.

tests/integration/slashing/abci_test.go renamed to tests/integration/v2/slashing/abci_test.go

+26-50
Original file line numberDiff line numberDiff line change
@@ -8,68 +8,43 @@ import (
88

99
"cosmossdk.io/core/comet"
1010
coreheader "cosmossdk.io/core/header"
11-
"cosmossdk.io/depinject"
12-
"cosmossdk.io/log"
13-
bankkeeper "cosmossdk.io/x/bank/keeper"
11+
"cosmossdk.io/runtime/v2/services"
1412
"cosmossdk.io/x/slashing"
15-
slashingkeeper "cosmossdk.io/x/slashing/keeper"
1613
"cosmossdk.io/x/slashing/testutil"
17-
stakingkeeper "cosmossdk.io/x/staking/keeper"
1814
stakingtestutil "cosmossdk.io/x/staking/testutil"
1915

20-
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
21-
"github.com/cosmos/cosmos-sdk/runtime"
16+
"github.com/cosmos/cosmos-sdk/tests/integration/v2"
2217
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
2318
sdk "github.com/cosmos/cosmos-sdk/types"
24-
authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
2519
)
2620

2721
// TestBeginBlocker is a unit test function that tests the behavior of the BeginBlocker function.
2822
// It sets up the necessary dependencies and context, creates a validator, and performs various operations
2923
// to test the slashing logic. It checks if the validator is correctly jailed after a certain number of blocks.
3024
func TestBeginBlocker(t *testing.T) {
31-
var (
32-
interfaceRegistry codectypes.InterfaceRegistry
33-
accountKeeper authkeeper.AccountKeeper
34-
bankKeeper bankkeeper.Keeper
35-
stakingKeeper *stakingkeeper.Keeper
36-
slashingKeeper slashingkeeper.Keeper
37-
)
38-
39-
app, err := simtestutil.Setup(
40-
depinject.Configs(
41-
AppConfig,
42-
depinject.Supply(log.NewNopLogger()),
43-
),
44-
&interfaceRegistry,
45-
&accountKeeper,
46-
&bankKeeper,
47-
&stakingKeeper,
48-
&slashingKeeper,
49-
)
50-
require.NoError(t, err)
25+
f := initFixture(t)
5126

52-
ctx := app.BaseApp.NewContext(false)
27+
ctx := f.ctx
5328

5429
pks := simtestutil.CreateTestPubKeys(1)
55-
simtestutil.AddTestAddrsFromPubKeys(bankKeeper, stakingKeeper, ctx, pks, stakingKeeper.TokensFromConsensusPower(ctx, 200))
30+
simtestutil.AddTestAddrsFromPubKeys(f.bankKeeper, f.stakingKeeper, ctx, pks, f.stakingKeeper.TokensFromConsensusPower(ctx, 200))
5631
addr, pk := sdk.ValAddress(pks[0].Address()), pks[0]
57-
tstaking := stakingtestutil.NewHelper(t, ctx, stakingKeeper)
32+
tstaking := stakingtestutil.NewHelper(t, ctx, f.stakingKeeper)
5833

5934
// bond the validator
6035
power := int64(100)
61-
acc := accountKeeper.NewAccountWithAddress(ctx, sdk.AccAddress(addr))
62-
accountKeeper.SetAccount(ctx, acc)
36+
acc := f.accountKeeper.NewAccountWithAddress(ctx, sdk.AccAddress(addr))
37+
f.accountKeeper.SetAccount(ctx, acc)
6338
amt := tstaking.CreateValidatorWithValPower(addr, pk, power, true)
64-
_, err = stakingKeeper.EndBlocker(ctx)
39+
_, err := f.stakingKeeper.EndBlocker(ctx)
6540
require.NoError(t, err)
66-
bondDenom, err := stakingKeeper.BondDenom(ctx)
41+
bondDenom, err := f.stakingKeeper.BondDenom(ctx)
6742
require.NoError(t, err)
6843
require.Equal(
69-
t, bankKeeper.GetAllBalances(ctx, sdk.AccAddress(addr)),
44+
t, f.bankKeeper.GetAllBalances(ctx, sdk.AccAddress(addr)),
7045
sdk.NewCoins(sdk.NewCoin(bondDenom, testutil.InitTokens.Sub(amt))),
7146
)
72-
val, err := stakingKeeper.Validator(ctx, addr)
47+
val, err := f.stakingKeeper.Validator(ctx, addr)
7348
require.NoError(t, err)
7449
require.Equal(t, amt, val.GetBondedTokens())
7550

@@ -78,57 +53,58 @@ func TestBeginBlocker(t *testing.T) {
7853
Power: power,
7954
}
8055

81-
ctx = ctx.WithCometInfo(comet.Info{
56+
ctx = integration.SetCometInfo(ctx, comet.Info{
8257
LastCommit: comet.CommitInfo{Votes: []comet.VoteInfo{{
8358
Validator: abciVal,
8459
BlockIDFlag: comet.BlockIDFlagCommit,
8560
}}},
8661
})
87-
cometInfoService := runtime.NewContextAwareCometInfoService()
62+
cometInfoService := &services.ContextAwareCometInfoService{}
8863

89-
err = slashing.BeginBlocker(ctx, slashingKeeper, cometInfoService)
64+
err = slashing.BeginBlocker(ctx, f.slashingKeeper, cometInfoService)
9065
require.NoError(t, err)
9166

92-
info, err := slashingKeeper.ValidatorSigningInfo.Get(ctx, sdk.ConsAddress(pk.Address()))
67+
info, err := f.slashingKeeper.ValidatorSigningInfo.Get(ctx, sdk.ConsAddress(pk.Address()))
9368
require.NoError(t, err)
94-
require.Equal(t, ctx.HeaderInfo().Height, info.StartHeight)
69+
require.Equal(t, integration.HeaderInfoFromContext(ctx).Height, info.StartHeight)
9570
require.Equal(t, int64(0), info.IndexOffset)
9671
require.Equal(t, time.Unix(0, 0).UTC(), info.JailedUntil)
9772
require.Equal(t, int64(0), info.MissedBlocksCounter)
9873

9974
height := int64(0)
10075

101-
signedBlocksWindow, err := slashingKeeper.SignedBlocksWindow(ctx)
76+
signedBlocksWindow, err := f.slashingKeeper.SignedBlocksWindow(ctx)
10277
require.NoError(t, err)
10378
// for 100 blocks, mark the validator as having signed
10479
for ; height < signedBlocksWindow; height++ {
105-
ctx = ctx.WithHeaderInfo(coreheader.Info{Height: height})
80+
ctx = integration.SetHeaderInfo(ctx, coreheader.Info{Height: height})
10681

107-
err = slashing.BeginBlocker(ctx, slashingKeeper, cometInfoService)
82+
err = slashing.BeginBlocker(ctx, f.slashingKeeper, cometInfoService)
10883
require.NoError(t, err)
10984
}
11085

111-
minSignedPerWindow, err := slashingKeeper.MinSignedPerWindow(ctx)
86+
minSignedPerWindow, err := f.slashingKeeper.MinSignedPerWindow(ctx)
11287
require.NoError(t, err)
11388
// for 50 blocks, mark the validator as having not signed
11489
for ; height < ((signedBlocksWindow * 2) - minSignedPerWindow + 1); height++ {
115-
ctx = ctx.WithHeaderInfo(coreheader.Info{Height: height}).WithCometInfo(comet.Info{
90+
ctx = integration.SetHeaderInfo(ctx, coreheader.Info{Height: height})
91+
ctx = integration.SetCometInfo(ctx, comet.Info{
11692
LastCommit: comet.CommitInfo{Votes: []comet.VoteInfo{{
11793
Validator: abciVal,
11894
BlockIDFlag: comet.BlockIDFlagAbsent,
11995
}}},
12096
})
12197

122-
err = slashing.BeginBlocker(ctx, slashingKeeper, cometInfoService)
98+
err = slashing.BeginBlocker(ctx, f.slashingKeeper, cometInfoService)
12399
require.NoError(t, err)
124100
}
125101

126102
// end block
127-
_, err = stakingKeeper.EndBlocker(ctx)
103+
_, err = f.stakingKeeper.EndBlocker(ctx)
128104
require.NoError(t, err)
129105

130106
// validator should be jailed
131-
validator, err := stakingKeeper.GetValidatorByConsAddr(ctx, sdk.GetConsAddress(pk))
107+
validator, err := f.stakingKeeper.GetValidatorByConsAddr(ctx, sdk.GetConsAddress(pk))
132108
require.NoError(t, err)
133109
require.Equal(t, sdk.Unbonding, validator.GetStatus())
134110
}

0 commit comments

Comments
 (0)