From 553ed3c171f6d182c9cd345c04f74bc6140e87b9 Mon Sep 17 00:00:00 2001 From: MSalopek Date: Wed, 9 Aug 2023 11:40:34 +0200 Subject: [PATCH] tests: revert reducing happyPath steps count --- tests/e2e/steps.go | 5 ++++- tests/e2e/steps_double_sign.go | 5 ++--- tests/e2e/steps_submit_equivocation_proposal.go | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/e2e/steps.go b/tests/e2e/steps.go index e6044985c6..0475429856 100644 --- a/tests/e2e/steps.go +++ b/tests/e2e/steps.go @@ -22,10 +22,13 @@ var happyPathSteps = concatSteps( stepsRedelegateForOptOut("consu"), stepsDowntimeWithOptOut("consu"), stepsRedelegate("consu"), + stepsDowntime("consu"), stepsRejectEquivocationProposal("consu", 2), // prop to tombstone bob is rejected stepsDoubleSignOnProviderAndConsumer("consu"), // carol double signs on provider, bob double signs on consumer stepsSubmitEquivocationProposal("consu", 2), // now prop to tombstone bob is submitted and accepted - stepsStopChain("consu", 3), // stop chain + stepsStartRelayer(), + stepsConsumerRemovalPropNotPassing("consu", 3), // submit removal prop but vote no on it - chain should stay + stepsStopChain("consu", 4), ) var shortHappyPathSteps = concatSteps( diff --git a/tests/e2e/steps_double_sign.go b/tests/e2e/steps_double_sign.go index 5068f7001d..c007fa5c1c 100644 --- a/tests/e2e/steps_double_sign.go +++ b/tests/e2e/steps_double_sign.go @@ -1,7 +1,6 @@ package main -// Steps that make carol double sign on the provider, and bob double sign on a single consumer. -// These steps happen after opt-out downtime traces have executed. +// Steps that make carol double sign on the provider, and bob double sign on a single consumer func stepsDoubleSignOnProviderAndConsumer(consumerName string) []Step { return []Step{ { @@ -23,7 +22,7 @@ func stepsDoubleSignOnProviderAndConsumer(consumerName string) []Step { ValPowers: &map[validatorID]uint{ validatorID("alice"): 509, validatorID("bob"): 500, - validatorID("carol"): 501, // not tombstoned on consumerName yet + validatorID("carol"): 495, // not tombstoned on consumerName yet }, }, }, diff --git a/tests/e2e/steps_submit_equivocation_proposal.go b/tests/e2e/steps_submit_equivocation_proposal.go index 802e09a138..8af1d2464d 100644 --- a/tests/e2e/steps_submit_equivocation_proposal.go +++ b/tests/e2e/steps_submit_equivocation_proposal.go @@ -21,7 +21,7 @@ func stepsRejectEquivocationProposal(consumerName string, propNumber uint) []Ste ValPowers: &map[validatorID]uint{ validatorID("alice"): 509, validatorID("bob"): 500, - validatorID("carol"): 501, + validatorID("carol"): 495, }, ValBalances: &map[validatorID]uint{ validatorID("bob"): 9500000000, @@ -35,7 +35,7 @@ func stepsRejectEquivocationProposal(consumerName string, propNumber uint) []Ste ValPowers: &map[validatorID]uint{ validatorID("alice"): 509, validatorID("bob"): 500, - validatorID("carol"): 501, + validatorID("carol"): 495, }, }, },