Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Goc december with specialized integration test #575

Closed
wants to merge 2 commits into from
Closed

Goc december with specialized integration test #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e79b6eb
rm TestSlashSameValidator
shaspitz Dec 9, 2022
2d38f04
integration test that halts query node
shaspitz Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions tests/e2e/throttle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ import (

sdktypes "github.com/cosmos/cosmos-sdk/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
icstestingutils "github.com/cosmos/interchain-security/testutil/ibc_testing"
providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types"
ccvtypes "github.com/cosmos/interchain-security/x/ccv/types"
tmtypes "github.com/tendermint/tendermint/types"
)

Expand Down Expand Up @@ -341,57 +339,6 @@ func (s *CCVTestSuite) TestSlashMeterAllowanceChanges() {

}

// TestSlashSameValidator tests the edge case that that the total slashed validator power
// queued up for a single block exceeds the slash meter allowance,
// but some of the slash packets are for the same validator, and should all be handled.
func (s *CCVTestSuite) TestSlashSameValidator() {

s.SetupAllCCVChannels()

// Setup 4 validators with 25% of the total power each.
s.setupValidatorPowers()

providerKeeper := s.providerApp.GetProviderKeeper()

// Set replenish fraction to 1.0 so that all sent packets should handled immediately (no throttling)
params := providerKeeper.GetParams(s.providerCtx())
params.SlashMeterReplenishFraction = "1.0"
providerKeeper.SetParams(s.providerCtx(), params)
providerKeeper.InitializeSlashMeter(s.providerCtx())

// Send a downtime and double-sign slash packet for 3/4 validators
// This will have a total slashing power of 150% total power.
tmval1 := s.providerChain.Vals.Validators[1]
tmval2 := s.providerChain.Vals.Validators[2]
tmval3 := s.providerChain.Vals.Validators[3]
s.setDefaultValSigningInfo(*tmval1)
s.setDefaultValSigningInfo(*tmval2)
s.setDefaultValSigningInfo(*tmval3)

packets := []channeltypes.Packet{
s.constructSlashPacketFromConsumer(s.getFirstBundle(), *tmval1, stakingtypes.Downtime, 1),
s.constructSlashPacketFromConsumer(s.getFirstBundle(), *tmval2, stakingtypes.Downtime, 2),
s.constructSlashPacketFromConsumer(s.getFirstBundle(), *tmval3, stakingtypes.Downtime, 3),
s.constructSlashPacketFromConsumer(s.getFirstBundle(), *tmval1, stakingtypes.DoubleSign, 4),
s.constructSlashPacketFromConsumer(s.getFirstBundle(), *tmval2, stakingtypes.DoubleSign, 5),
s.constructSlashPacketFromConsumer(s.getFirstBundle(), *tmval3, stakingtypes.DoubleSign, 6),
}

// Recv and queue all slash packets.
for _, packet := range packets {
providerKeeper.OnRecvSlashPacket(s.providerCtx(), packet, ccvtypes.MustUnmarshalJsonBzToSlashPacketData(packet.GetData()))
}

// We should have 6 pending slash packet entries queued.
s.Require().Len(providerKeeper.GetAllPendingSlashPacketEntries(s.providerCtx()), 6)

// Call next block to process all pending slash packets in end blocker.
s.providerChain.NextBlock()

// All slash packets should have been handled immediately, even though they totaled to 150% of total power.
s.Require().Len(providerKeeper.GetAllPendingSlashPacketEntries(s.providerCtx()), 0)
}

func (s *CCVTestSuite) confirmValidatorJailed(tmVal tmtypes.Validator) {
sdkVal, found := s.providerApp.GetE2eStakingKeeper().GetValidator(
s.providerCtx(), sdktypes.ValAddress(tmVal.Address))
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ func (tr TestRun) invokeDowntimeSlash(action downtimeSlashAction, verbose bool)
// Bring validator down
tr.setValidatorDowntime(action.chain, action.validator, true, verbose)
// Wait appropriate amount of blocks for validator to be slashed
tr.waitBlocks(action.chain, 3, time.Minute)
tr.waitBlocks(action.chain, 5, time.Minute)
// Bring validator back up
tr.setValidatorDowntime(action.chain, action.validator, false, verbose)
}
Expand Down
24 changes: 12 additions & 12 deletions tests/integration/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,29 @@ func main() {
tr.ValidateStringLiterals()
tr.startDocker()

dmc := DemocracyTestRun()
dmc.SetLocalSDKPath(*localSdkPath)
dmc.ValidateStringLiterals()
dmc.startDocker()
// dmc := DemocracyTestRun()
// dmc.SetLocalSDKPath(*localSdkPath)
// dmc.ValidateStringLiterals()
// dmc.startDocker()

// mul := MultiConsumerTestRun()
// mul.SetLocalSDKPath(*localSdkPath)
// mul.ValidateStringLiterals()
// mul.startDocker()

keys := KeyAssignmentTestRun()
keys.SetLocalSDKPath(*localSdkPath)
keys.ValidateStringLiterals()
keys.startDocker()
// keys := KeyAssignmentTestRun()
// keys.SetLocalSDKPath(*localSdkPath)
// keys.ValidateStringLiterals()
// keys.startDocker()

wg.Add(1)
go keys.ExecuteSteps(&wg, keyAssignmentSteps)
// wg.Add(1)
// go keys.ExecuteSteps(&wg, keyAssignmentSteps)

wg.Add(1)
go tr.ExecuteSteps(&wg, happyPathSteps)

wg.Add(1)
go dmc.ExecuteSteps(&wg, democracySteps)
// wg.Add(1)
// go dmc.ExecuteSteps(&wg, democracySteps)

// wg.Add(1)
// go mul.ExecuteSteps(&wg, multipleConsumers)
Expand Down
54 changes: 27 additions & 27 deletions tests/integration/steps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,38 @@ func concatSteps(steps ...[]Step) []Step {
return concat
}

var keyAssignmentSteps = concatSteps(
stepsStartChains([]string{"consu"}, false),
stepsDelegate("consu"),
stepsAssignConsumerKeyOnStartedChain("consu", "bob"),
stepsUnbond("consu"),
stepsRedelegate("consu"),
)
// var keyAssignmentSteps = concatSteps(
// stepsStartChains([]string{"consu"}, false),
// stepsDelegate("consu"),
// stepsAssignConsumerKeyOnStartedChain("consu", "bob"),
// stepsUnbond("consu"),
// stepsRedelegate("consu"),
// )

var happyPathSteps = concatSteps(
stepsStartChains([]string{"consu"}, false),
stepsDelegate("consu"),
stepsUnbond("consu"),
stepsRedelegate("consu"),
// stepsDelegate("consu"),
// stepsUnbond("consu"),
// stepsRedelegate("consu"),
stepsDowntime("consu"),
stepsStopChain("consu"),
// stepsStopChain("consu"),
)

var democracySteps = concatSteps(
// democracySteps requires a transfer channel
stepsStartChains([]string{"democ"}, true),
// delegation needs to happen so the first VSC packet can be delivered
stepsDelegate("democ"),
stepsDemocracy("democ"),
)
// var democracySteps = concatSteps(
// // democracySteps requires a transfer channel
// stepsStartChains([]string{"democ"}, true),
// // delegation needs to happen so the first VSC packet can be delivered
// stepsDelegate("democ"),
// stepsDemocracy("democ"),
// )

//nolint
var multipleConsumers = concatSteps(
stepsStartChains([]string{"consu", "densu"}, false),
stepsMultiConsumerDelegate("consu", "densu"),
stepsMultiConsumerUnbond("consu", "densu"),
stepsMultiConsumerRedelegate("consu", "densu"),
stepsMultiConsumerDowntimeFromConsumer("consu", "densu"),
stepsMultiConsumerDowntimeFromProvider("consu", "densu"),
stepsDoubleSign("consu", "densu"), // double sign on one of the chains
)
// var multipleConsumers = concatSteps(
// stepsStartChains([]string{"consu", "densu"}, false),
// stepsMultiConsumerDelegate("consu", "densu"),
// stepsMultiConsumerUnbond("consu", "densu"),
// stepsMultiConsumerRedelegate("consu", "densu"),
// stepsMultiConsumerDowntimeFromConsumer("consu", "densu"),
// stepsMultiConsumerDowntimeFromProvider("consu", "densu"),
// stepsDoubleSign("consu", "densu"), // double sign on one of the chains
// )
Loading