From 8a5932dd9a4b01b3dbefe59c24ad808c1a213aa7 Mon Sep 17 00:00:00 2001 From: Dzung Do | Decentrio Date: Mon, 11 Dec 2023 22:51:20 +0700 Subject: [PATCH] refactor: Capitalized e2e test action name (#1494) * Capitalized all action's names * Fix typo ReDelegate --- tests/e2e/action_rapid_test.go | 196 +++++++++--------- tests/e2e/actions.go | 146 ++++++------- tests/e2e/actions_consumer_misbehaviour.go | 12 +- tests/e2e/actions_sovereign_chain.go | 6 +- tests/e2e/json_utils.go | 132 ++++++------ tests/e2e/main.go | 66 +++--- tests/e2e/step_delegation.go | 28 +-- tests/e2e/steps_consumer_misbehaviour.go | 24 +-- tests/e2e/steps_democracy.go | 26 +-- tests/e2e/steps_double_sign.go | 10 +- tests/e2e/steps_downtime.go | 36 ++-- tests/e2e/steps_light_client_attack.go | 10 +- tests/e2e/steps_multi_consumer_delegation.go | 18 +- tests/e2e/steps_multi_consumer_double_sign.go | 14 +- tests/e2e/steps_multi_consumer_downtime.go | 26 +-- tests/e2e/steps_reward_denom.go | 26 +-- tests/e2e/steps_sovereign_changeover.go | 26 +-- tests/e2e/steps_start_chains.go | 22 +- tests/e2e/steps_stop_chain.go | 10 +- tests/e2e/trace_handlers_test.go | 4 +- .../e2e/tracehandler_testdata/changeover.json | 26 +-- .../consumer-double-sign.json | 22 +- .../consumer-misbehaviour.json | 24 +-- .../e2e/tracehandler_testdata/democracy.json | 48 ++--- .../democracyRewardsSteps.json | 48 ++--- .../e2e/tracehandler_testdata/happyPath.json | 80 +++---- .../multipleConsumers.json | 90 ++++---- .../e2e/tracehandler_testdata/shorthappy.json | 60 +++--- .../tracehandler_testdata/slashThrottle.json | 38 ++-- 29 files changed, 637 insertions(+), 637 deletions(-) diff --git a/tests/e2e/action_rapid_test.go b/tests/e2e/action_rapid_test.go index 871b78dc24..366f7f61c0 100644 --- a/tests/e2e/action_rapid_test.go +++ b/tests/e2e/action_rapid_test.go @@ -96,9 +96,9 @@ func GetActionGen() *rapid.Generator[any] { ) } -func CreateSubmitChangeRewardDenomsProposalActionGen() *rapid.Generator[submitChangeRewardDenomsProposalAction] { - return rapid.Custom(func(t *rapid.T) submitChangeRewardDenomsProposalAction { - return submitChangeRewardDenomsProposalAction{ +func CreateSubmitChangeRewardDenomsProposalActionGen() *rapid.Generator[SubmitChangeRewardDenomsProposalAction] { + return rapid.Custom(func(t *rapid.T) SubmitChangeRewardDenomsProposalAction { + return SubmitChangeRewardDenomsProposalAction{ From: GetValidatorIDGen().Draw(t, "From"), Deposit: rapid.Uint().Draw(t, "Deposit"), Denom: rapid.String().Draw(t, "Denom"), @@ -106,36 +106,36 @@ func CreateSubmitChangeRewardDenomsProposalActionGen() *rapid.Generator[submitCh }) } -func CreateLightClientEquivocationAttackActionGen() *rapid.Generator[lightClientEquivocationAttackAction] { - return rapid.Custom(func(t *rapid.T) lightClientEquivocationAttackAction { - return lightClientEquivocationAttackAction{ +func CreateLightClientEquivocationAttackActionGen() *rapid.Generator[LightClientEquivocationAttackAction] { + return rapid.Custom(func(t *rapid.T) LightClientEquivocationAttackAction { + return LightClientEquivocationAttackAction{ Validator: GetValidatorIDGen().Draw(t, "Validator"), Chain: GetChainIDGen().Draw(t, "Chain"), } }) } -func CreateLightClientAmnesiaAttackActionGen() *rapid.Generator[lightClientAmnesiaAttackAction] { - return rapid.Custom(func(t *rapid.T) lightClientAmnesiaAttackAction { - return lightClientAmnesiaAttackAction{ +func CreateLightClientAmnesiaAttackActionGen() *rapid.Generator[LightClientAmnesiaAttackAction] { + return rapid.Custom(func(t *rapid.T) LightClientAmnesiaAttackAction { + return LightClientAmnesiaAttackAction{ Validator: GetValidatorIDGen().Draw(t, "Validator"), Chain: GetChainIDGen().Draw(t, "Chain"), } }) } -func CreateLightClientLunaticAttackActionGen() *rapid.Generator[lightClientLunaticAttackAction] { - return rapid.Custom(func(t *rapid.T) lightClientLunaticAttackAction { - return lightClientLunaticAttackAction{ +func CreateLightClientLunaticAttackActionGen() *rapid.Generator[LightClientLunaticAttackAction] { + return rapid.Custom(func(t *rapid.T) LightClientLunaticAttackAction { + return LightClientLunaticAttackAction{ Validator: GetValidatorIDGen().Draw(t, "Validator"), Chain: GetChainIDGen().Draw(t, "Chain"), } }) } -func CreateCancelUnbondTokensActionGen() *rapid.Generator[cancelUnbondTokensAction] { - return rapid.Custom(func(t *rapid.T) cancelUnbondTokensAction { - return cancelUnbondTokensAction{ +func CreateCancelUnbondTokensActionGen() *rapid.Generator[CancelUnbondTokensAction] { + return rapid.Custom(func(t *rapid.T) CancelUnbondTokensAction { + return CancelUnbondTokensAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Amount: rapid.Uint().Draw(t, "Amount"), Delegator: GetValidatorIDGen().Draw(t, "Delegator"), @@ -144,9 +144,9 @@ func CreateCancelUnbondTokensActionGen() *rapid.Generator[cancelUnbondTokensActi }) } -func GetCreateIbcClientsActionGen() *rapid.Generator[createIbcClientsAction] { - return rapid.Custom(func(t *rapid.T) createIbcClientsAction { - return createIbcClientsAction{ +func GetCreateIbcClientsActionGen() *rapid.Generator[CreateIbcClientsAction] { + return rapid.Custom(func(t *rapid.T) CreateIbcClientsAction { + return CreateIbcClientsAction{ ChainA: GetChainIDGen().Draw(t, "ChainA"), ChainB: GetChainIDGen().Draw(t, "ChainB"), } @@ -174,9 +174,9 @@ func GetSubmitLegacyUpgradeProposalActionGen() *rapid.Generator[LegacyUpgradePro }) } -func GetWaitUntilBlockActionGen() *rapid.Generator[waitUntilBlockAction] { - return rapid.Custom(func(t *rapid.T) waitUntilBlockAction { - return waitUntilBlockAction{ +func GetWaitUntilBlockActionGen() *rapid.Generator[WaitUntilBlockAction] { + return rapid.Custom(func(t *rapid.T) WaitUntilBlockAction { + return WaitUntilBlockAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Block: rapid.Uint().Draw(t, "Block"), } @@ -232,9 +232,9 @@ func GetStartChainValidatorGen() *rapid.Generator[StartChainValidator] { }) } -func GetSubmitTextProposalActionGen() *rapid.Generator[submitTextProposalAction] { - return rapid.Custom(func(t *rapid.T) submitTextProposalAction { - return submitTextProposalAction{ +func GetSubmitTextProposalActionGen() *rapid.Generator[SubmitTextProposalAction] { + return rapid.Custom(func(t *rapid.T) SubmitTextProposalAction { + return SubmitTextProposalAction{ Chain: GetChainIDGen().Draw(t, "Chain"), From: GetValidatorIDGen().Draw(t, "From"), Deposit: rapid.Uint().Draw(t, "Deposit"), @@ -244,9 +244,9 @@ func GetSubmitTextProposalActionGen() *rapid.Generator[submitTextProposalAction] }) } -func GetSubmitConsumerAdditionProposalActionGen() *rapid.Generator[submitConsumerAdditionProposalAction] { - return rapid.Custom(func(t *rapid.T) submitConsumerAdditionProposalAction { - return submitConsumerAdditionProposalAction{ +func GetSubmitConsumerAdditionProposalActionGen() *rapid.Generator[SubmitConsumerAdditionProposalAction] { + return rapid.Custom(func(t *rapid.T) SubmitConsumerAdditionProposalAction { + return SubmitConsumerAdditionProposalAction{ Chain: GetChainIDGen().Draw(t, "Chain"), From: GetValidatorIDGen().Draw(t, "From"), Deposit: rapid.Uint().Draw(t, "Deposit"), @@ -257,9 +257,9 @@ func GetSubmitConsumerAdditionProposalActionGen() *rapid.Generator[submitConsume }) } -func GetSubmitConsumerRemovalProposalActionGen() *rapid.Generator[submitConsumerRemovalProposalAction] { - return rapid.Custom(func(t *rapid.T) submitConsumerRemovalProposalAction { - return submitConsumerRemovalProposalAction{ +func GetSubmitConsumerRemovalProposalActionGen() *rapid.Generator[SubmitConsumerRemovalProposalAction] { + return rapid.Custom(func(t *rapid.T) SubmitConsumerRemovalProposalAction { + return SubmitConsumerRemovalProposalAction{ Chain: GetChainIDGen().Draw(t, "Chain"), From: GetValidatorIDGen().Draw(t, "From"), Deposit: rapid.Uint().Draw(t, "Deposit"), @@ -269,9 +269,9 @@ func GetSubmitConsumerRemovalProposalActionGen() *rapid.Generator[submitConsumer }) } -func GetSubmitParamChangeProposalActionGen() *rapid.Generator[submitParamChangeLegacyProposalAction] { - return rapid.Custom(func(t *rapid.T) submitParamChangeLegacyProposalAction { - return submitParamChangeLegacyProposalAction{ +func GetSubmitParamChangeProposalActionGen() *rapid.Generator[SubmitParamChangeLegacyProposalAction] { + return rapid.Custom(func(t *rapid.T) SubmitParamChangeLegacyProposalAction { + return SubmitParamChangeLegacyProposalAction{ Chain: GetChainIDGen().Draw(t, "Chain"), From: GetValidatorIDGen().Draw(t, "From"), Deposit: rapid.Uint().Draw(t, "Deposit"), @@ -300,9 +300,9 @@ func GetTimeGen() *rapid.Generator[time.Time] { }) } -func GetVoteGovProposalActionGen() *rapid.Generator[voteGovProposalAction] { - return rapid.Custom(func(t *rapid.T) voteGovProposalAction { - return voteGovProposalAction{ +func GetVoteGovProposalActionGen() *rapid.Generator[VoteGovProposalAction] { + return rapid.Custom(func(t *rapid.T) VoteGovProposalAction { + return VoteGovProposalAction{ Chain: GetChainIDGen().Draw(t, "Chain"), From: rapid.SliceOf(GetValidatorIDGen()).Draw(t, "From"), Vote: rapid.SliceOf(rapid.String()).Draw(t, "Vote"), @@ -311,9 +311,9 @@ func GetVoteGovProposalActionGen() *rapid.Generator[voteGovProposalAction] { }) } -func GetStartConsumerChainActionGen() *rapid.Generator[startConsumerChainAction] { - return rapid.Custom(func(t *rapid.T) startConsumerChainAction { - return startConsumerChainAction{ +func GetStartConsumerChainActionGen() *rapid.Generator[StartConsumerChainAction] { + return rapid.Custom(func(t *rapid.T) StartConsumerChainAction { + return StartConsumerChainAction{ ConsumerChain: GetChainIDGen().Draw(t, "ConsumerChain"), ProviderChain: GetChainIDGen().Draw(t, "ProviderChain"), Validators: GetStartChainValidatorsGen().Draw(t, "Validators"), @@ -322,18 +322,18 @@ func GetStartConsumerChainActionGen() *rapid.Generator[startConsumerChainAction] }) } -func GetAddChainToRelayerActionGen() *rapid.Generator[addChainToRelayerAction] { - return rapid.Custom(func(t *rapid.T) addChainToRelayerAction { - return addChainToRelayerAction{ +func GetAddChainToRelayerActionGen() *rapid.Generator[AddChainToRelayerAction] { + return rapid.Custom(func(t *rapid.T) AddChainToRelayerAction { + return AddChainToRelayerAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Validator: GetValidatorIDGen().Draw(t, "Validator"), } }) } -func GetAddIbcConnectionActionGen() *rapid.Generator[addIbcConnectionAction] { - return rapid.Custom(func(t *rapid.T) addIbcConnectionAction { - return addIbcConnectionAction{ +func GetAddIbcConnectionActionGen() *rapid.Generator[AddIbcConnectionAction] { + return rapid.Custom(func(t *rapid.T) AddIbcConnectionAction { + return AddIbcConnectionAction{ ChainA: GetChainIDGen().Draw(t, "ChainA"), ChainB: GetChainIDGen().Draw(t, "ChainB"), ClientA: rapid.Uint().Draw(t, "ClientA"), @@ -342,9 +342,9 @@ func GetAddIbcConnectionActionGen() *rapid.Generator[addIbcConnectionAction] { }) } -func GetAddIbcChannelActionGen() *rapid.Generator[addIbcChannelAction] { - return rapid.Custom(func(t *rapid.T) addIbcChannelAction { - return addIbcChannelAction{ +func GetAddIbcChannelActionGen() *rapid.Generator[AddIbcChannelAction] { + return rapid.Custom(func(t *rapid.T) AddIbcChannelAction { + return AddIbcChannelAction{ ChainA: GetChainIDGen().Draw(t, "ChainA"), ChainB: GetChainIDGen().Draw(t, "ChainB"), ConnectionA: rapid.Uint().Draw(t, "ConnectionA"), @@ -355,13 +355,13 @@ func GetAddIbcChannelActionGen() *rapid.Generator[addIbcChannelAction] { }) } -func GetStartRelayerActionGen() *rapid.Generator[startRelayerAction] { - return rapid.Just(startRelayerAction{}) +func GetStartRelayerActionGen() *rapid.Generator[StartRelayerAction] { + return rapid.Just(StartRelayerAction{}) } -func GetTransferChannelCompleteActionGen() *rapid.Generator[transferChannelCompleteAction] { - return rapid.Custom(func(t *rapid.T) transferChannelCompleteAction { - return transferChannelCompleteAction{ +func GetTransferChannelCompleteActionGen() *rapid.Generator[TransferChannelCompleteAction] { + return rapid.Custom(func(t *rapid.T) TransferChannelCompleteAction { + return TransferChannelCompleteAction{ ChainA: GetChainIDGen().Draw(t, "ChainA"), ChainB: GetChainIDGen().Draw(t, "ChainB"), ConnectionA: rapid.Uint().Draw(t, "ConnectionA"), @@ -374,9 +374,9 @@ func GetTransferChannelCompleteActionGen() *rapid.Generator[transferChannelCompl }) } -func GetRelayPacketsActionGen() *rapid.Generator[relayPacketsAction] { - return rapid.Custom(func(t *rapid.T) relayPacketsAction { - return relayPacketsAction{ +func GetRelayPacketsActionGen() *rapid.Generator[RelayPacketsAction] { + return rapid.Custom(func(t *rapid.T) RelayPacketsAction { + return RelayPacketsAction{ ChainA: GetChainIDGen().Draw(t, "Chain"), ChainB: GetChainIDGen().Draw(t, "Chain"), Port: rapid.String().Draw(t, "Port"), @@ -385,9 +385,9 @@ func GetRelayPacketsActionGen() *rapid.Generator[relayPacketsAction] { }) } -func GetRelayRewardPacketsToProviderActionGen() *rapid.Generator[relayRewardPacketsToProviderAction] { - return rapid.Custom(func(t *rapid.T) relayRewardPacketsToProviderAction { - return relayRewardPacketsToProviderAction{ +func GetRelayRewardPacketsToProviderActionGen() *rapid.Generator[RelayRewardPacketsToProviderAction] { + return rapid.Custom(func(t *rapid.T) RelayRewardPacketsToProviderAction { + return RelayRewardPacketsToProviderAction{ ConsumerChain: GetChainIDGen().Draw(t, "ConsumerChain"), ProviderChain: GetChainIDGen().Draw(t, "ProviderChain"), Port: rapid.String().Draw(t, "Port"), @@ -396,9 +396,9 @@ func GetRelayRewardPacketsToProviderActionGen() *rapid.Generator[relayRewardPack }) } -func GetDelegateTokensActionGen() *rapid.Generator[delegateTokensAction] { - return rapid.Custom(func(t *rapid.T) delegateTokensAction { - return delegateTokensAction{ +func GetDelegateTokensActionGen() *rapid.Generator[DelegateTokensAction] { + return rapid.Custom(func(t *rapid.T) DelegateTokensAction { + return DelegateTokensAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Amount: rapid.Uint().Draw(t, "Amount"), From: GetValidatorIDGen().Draw(t, "From"), @@ -407,9 +407,9 @@ func GetDelegateTokensActionGen() *rapid.Generator[delegateTokensAction] { }) } -func GetUnbondTokensActionGen() *rapid.Generator[unbondTokensAction] { - return rapid.Custom(func(t *rapid.T) unbondTokensAction { - return unbondTokensAction{ +func GetUnbondTokensActionGen() *rapid.Generator[UnbondTokensAction] { + return rapid.Custom(func(t *rapid.T) UnbondTokensAction { + return UnbondTokensAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Amount: rapid.Uint().Draw(t, "Amount"), Sender: GetValidatorIDGen().Draw(t, "Sender"), @@ -418,9 +418,9 @@ func GetUnbondTokensActionGen() *rapid.Generator[unbondTokensAction] { }) } -func GetRedelegateTokensActionGen() *rapid.Generator[redelegateTokensAction] { - return rapid.Custom(func(t *rapid.T) redelegateTokensAction { - return redelegateTokensAction{ +func GetRedelegateTokensActionGen() *rapid.Generator[RedelegateTokensAction] { + return rapid.Custom(func(t *rapid.T) RedelegateTokensAction { + return RedelegateTokensAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Amount: rapid.Uint().Draw(t, "Amount"), Src: GetValidatorIDGen().Draw(t, "Src"), @@ -430,27 +430,27 @@ func GetRedelegateTokensActionGen() *rapid.Generator[redelegateTokensAction] { }) } -func GetDowntimeSlashActionGen() *rapid.Generator[downtimeSlashAction] { - return rapid.Custom(func(t *rapid.T) downtimeSlashAction { - return downtimeSlashAction{ +func GetDowntimeSlashActionGen() *rapid.Generator[DowntimeSlashAction] { + return rapid.Custom(func(t *rapid.T) DowntimeSlashAction { + return DowntimeSlashAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Validator: GetValidatorIDGen().Draw(t, "Validator"), } }) } -func GetUnjailValidatorActionGen() *rapid.Generator[unjailValidatorAction] { - return rapid.Custom(func(t *rapid.T) unjailValidatorAction { - return unjailValidatorAction{ +func GetUnjailValidatorActionGen() *rapid.Generator[UnjailValidatorAction] { + return rapid.Custom(func(t *rapid.T) UnjailValidatorAction { + return UnjailValidatorAction{ Validator: GetValidatorIDGen().Draw(t, "Validator"), Provider: GetChainIDGen().Draw(t, "Provider"), } }) } -func GetRegisterRepresentativeActionGen() *rapid.Generator[registerRepresentativeAction] { - return rapid.Custom(func(t *rapid.T) registerRepresentativeAction { - return registerRepresentativeAction{ +func GetRegisterRepresentativeActionGen() *rapid.Generator[RegisterRepresentativeAction] { + return rapid.Custom(func(t *rapid.T) RegisterRepresentativeAction { + return RegisterRepresentativeAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Representatives: rapid.SliceOf(GetValidatorIDGen()).Draw(t, "Representatives"), Stakes: rapid.SliceOf(rapid.Uint()).Draw(t, "Stakes"), @@ -458,18 +458,18 @@ func GetRegisterRepresentativeActionGen() *rapid.Generator[registerRepresentativ }) } -func GetDoublesignSlashActionGen() *rapid.Generator[doublesignSlashAction] { - return rapid.Custom(func(t *rapid.T) doublesignSlashAction { - return doublesignSlashAction{ +func GetDoublesignSlashActionGen() *rapid.Generator[DoublesignSlashAction] { + return rapid.Custom(func(t *rapid.T) DoublesignSlashAction { + return DoublesignSlashAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Validator: GetValidatorIDGen().Draw(t, "Validator"), } }) } -func GetAssignConsumerPubKeyActionGen() *rapid.Generator[assignConsumerPubKeyAction] { - return rapid.Custom(func(t *rapid.T) assignConsumerPubKeyAction { - return assignConsumerPubKeyAction{ +func GetAssignConsumerPubKeyActionGen() *rapid.Generator[AssignConsumerPubKeyAction] { + return rapid.Custom(func(t *rapid.T) AssignConsumerPubKeyAction { + return AssignConsumerPubKeyAction{ Chain: GetChainIDGen().Draw(t, "Chain"), Validator: GetValidatorIDGen().Draw(t, "Validator"), ConsumerPubkey: rapid.String().Draw(t, "ConsumerPubkey"), @@ -479,26 +479,26 @@ func GetAssignConsumerPubKeyActionGen() *rapid.Generator[assignConsumerPubKeyAct }) } -func GetSlashMeterReplenishmentAction() *rapid.Generator[slashMeterReplenishmentAction] { - return rapid.Custom(func(t *rapid.T) slashMeterReplenishmentAction { - return slashMeterReplenishmentAction{ +func GetSlashMeterReplenishmentAction() *rapid.Generator[SlashMeterReplenishmentAction] { + return rapid.Custom(func(t *rapid.T) SlashMeterReplenishmentAction { + return SlashMeterReplenishmentAction{ TargetValue: rapid.Int64().Draw(t, "TargetValue"), Timeout: time.Duration(rapid.Int().Draw(t, "Timeout")) * time.Millisecond, } }) } -func GetWaitTimeAction() *rapid.Generator[waitTimeAction] { - return rapid.Custom(func(t *rapid.T) waitTimeAction { - return waitTimeAction{ +func GetWaitTimeAction() *rapid.Generator[WaitTimeAction] { + return rapid.Custom(func(t *rapid.T) WaitTimeAction { + return WaitTimeAction{ WaitTime: time.Duration(rapid.Int().Draw(t, "Timeout")) * time.Millisecond, } }) } -func GetForkConsumerChainActionGen() *rapid.Generator[forkConsumerChainAction] { - return rapid.Custom(func(t *rapid.T) forkConsumerChainAction { - return forkConsumerChainAction{ +func GetForkConsumerChainActionGen() *rapid.Generator[ForkConsumerChainAction] { + return rapid.Custom(func(t *rapid.T) ForkConsumerChainAction { + return ForkConsumerChainAction{ ConsumerChain: GetChainIDGen().Draw(t, "ConsumerChain"), ProviderChain: GetChainIDGen().Draw(t, "ProviderChain"), Validator: GetValidatorIDGen().Draw(t, "Validator"), @@ -507,17 +507,17 @@ func GetForkConsumerChainActionGen() *rapid.Generator[forkConsumerChainAction] { }) } -func GetStartConsumerEvidenceDetectorActionGen() *rapid.Generator[startConsumerEvidenceDetectorAction] { - return rapid.Custom(func(t *rapid.T) startConsumerEvidenceDetectorAction { - return startConsumerEvidenceDetectorAction{ +func GetStartConsumerEvidenceDetectorActionGen() *rapid.Generator[StartConsumerEvidenceDetectorAction] { + return rapid.Custom(func(t *rapid.T) StartConsumerEvidenceDetectorAction { + return StartConsumerEvidenceDetectorAction{ Chain: GetChainIDGen().Draw(t, "Chain"), } }) } -func GetUpdateLightClientActionGen() *rapid.Generator[updateLightClientAction] { - return rapid.Custom(func(t *rapid.T) updateLightClientAction { - return updateLightClientAction{ +func GetUpdateLightClientActionGen() *rapid.Generator[UpdateLightClientAction] { + return rapid.Custom(func(t *rapid.T) UpdateLightClientAction { + return UpdateLightClientAction{ Chain: GetChainIDGen().Draw(t, "Chain"), HostChain: GetChainIDGen().Draw(t, "HostChain"), RelayerConfig: rapid.String().Draw(t, "RelayerConfig"), diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go index b95be90d12..a54ea9ad27 100644 --- a/tests/e2e/actions.go +++ b/tests/e2e/actions.go @@ -169,7 +169,7 @@ func (tr *TestConfig) startChain( log.Fatal(err) } - tr.addChainToRelayer(addChainToRelayerAction{ + tr.addChainToRelayer(AddChainToRelayerAction{ Chain: action.Chain, Validator: action.Validators[0].Id, IsConsumer: action.IsConsumer, @@ -184,7 +184,7 @@ func (tr *TestConfig) startChain( } } -type submitTextProposalAction struct { +type SubmitTextProposalAction struct { Chain ChainID From ValidatorID Deposit uint @@ -193,7 +193,7 @@ type submitTextProposalAction struct { } func (tr TestConfig) submitTextProposal( - action submitTextProposalAction, + action SubmitTextProposalAction, verbose bool, ) { // TEXT PROPOSAL @@ -218,7 +218,7 @@ func (tr TestConfig) submitTextProposal( tr.waitBlocks(action.Chain, 1, 10*time.Second) } -type submitConsumerAdditionProposalAction struct { +type SubmitConsumerAdditionProposalAction struct { PreCCV bool Chain ChainID From ValidatorID @@ -230,7 +230,7 @@ type submitConsumerAdditionProposalAction struct { } func (tr TestConfig) submitConsumerAdditionProposal( - action submitConsumerAdditionProposalAction, + action SubmitConsumerAdditionProposalAction, verbose bool, ) { spawnTime := tr.containerConfig.Now.Add(time.Duration(action.SpawnTime) * time.Millisecond) @@ -292,7 +292,7 @@ func (tr TestConfig) submitConsumerAdditionProposal( tr.waitBlocks(ChainID("provi"), 2, 10*time.Second) } -type submitConsumerRemovalProposalAction struct { +type SubmitConsumerRemovalProposalAction struct { Chain ChainID From ValidatorID Deposit uint @@ -301,7 +301,7 @@ type submitConsumerRemovalProposalAction struct { } func (tr TestConfig) submitConsumerRemovalProposal( - action submitConsumerRemovalProposalAction, + action SubmitConsumerRemovalProposalAction, verbose bool, ) { stopTime := tr.containerConfig.Now.Add(action.StopTimeOffset) @@ -353,7 +353,7 @@ func (tr TestConfig) submitConsumerRemovalProposal( tr.waitBlocks(ChainID("provi"), 2, 20*time.Second) } -type submitParamChangeLegacyProposalAction struct { +type SubmitParamChangeLegacyProposalAction struct { Chain ChainID From ValidatorID Deposit uint @@ -377,7 +377,7 @@ type paramChangeJSON struct { } func (tr TestConfig) submitParamChangeProposal( - action submitParamChangeLegacyProposalAction, + action SubmitParamChangeLegacyProposalAction, verbose bool, ) { prop := paramChangeProposalJSON{ @@ -430,7 +430,7 @@ func (tr TestConfig) submitParamChangeProposal( tr.waitBlocks(action.Chain, 2, 60*time.Second) } -type voteGovProposalAction struct { +type VoteGovProposalAction struct { Chain ChainID From []ValidatorID Vote []string @@ -438,7 +438,7 @@ type voteGovProposalAction struct { } func (tr *TestConfig) voteGovProposal( - action voteGovProposalAction, + action VoteGovProposalAction, verbose bool, ) { var wg sync.WaitGroup @@ -473,7 +473,7 @@ func (tr *TestConfig) voteGovProposal( tr.WaitTime(time.Duration(tr.chainConfigs[action.Chain].VotingWaitTime) * time.Second) } -type startConsumerChainAction struct { +type StartConsumerChainAction struct { ConsumerChain ChainID ProviderChain ChainID Validators []StartChainValidator @@ -481,7 +481,7 @@ type startConsumerChainAction struct { } func (tr *TestConfig) startConsumerChain( - action startConsumerChainAction, + action StartConsumerChainAction, verbose bool, ) { //#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments. @@ -644,7 +644,7 @@ func (tr TestConfig) startChangeover( } } -type addChainToRelayerAction struct { +type AddChainToRelayerAction struct { Chain ChainID Validator ValidatorID IsConsumer bool @@ -699,7 +699,7 @@ const gorelayerChainConfigTemplate = ` }` func (tr TestConfig) addChainToRelayer( - action addChainToRelayerAction, + action AddChainToRelayerAction, verbose bool, ) { if !tr.useGorelayer { @@ -710,7 +710,7 @@ func (tr TestConfig) addChainToRelayer( } func (tr TestConfig) addChainToGorelayer( - action addChainToRelayerAction, + action AddChainToRelayerAction, verbose bool, ) { queryNodeIP := tr.getQueryNodeIP(action.Chain) @@ -748,7 +748,7 @@ func (tr TestConfig) addChainToGorelayer( } func (tr TestConfig) addChainToHermes( - action addChainToRelayerAction, + action AddChainToRelayerAction, verbose bool, ) { queryNodeIP := tr.getQueryNodeIP(action.Chain) @@ -827,7 +827,7 @@ const gorelayerPathConfigTemplate = `{ } ` -type addIbcConnectionAction struct { +type AddIbcConnectionAction struct { ChainA ChainID ChainB ChainID ClientA uint @@ -835,7 +835,7 @@ type addIbcConnectionAction struct { } func (tr TestConfig) addIbcConnection( - action addIbcConnectionAction, + action AddIbcConnectionAction, verbose bool, ) { if !tr.useGorelayer { @@ -846,7 +846,7 @@ func (tr TestConfig) addIbcConnection( } func (tr TestConfig) addIbcConnectionGorelayer( - action addIbcConnectionAction, + action AddIbcConnectionAction, verbose bool, ) { pathName := tr.GetPathNameForGorelayer(action.ChainA, action.ChainB) @@ -895,7 +895,7 @@ func (tr TestConfig) addIbcConnectionGorelayer( tr.waitBlocks(action.ChainB, 1, 10*time.Second) } -type createIbcClientsAction struct { +type CreateIbcClientsAction struct { ChainA ChainID ChainB ChainID } @@ -904,7 +904,7 @@ type createIbcClientsAction struct { // create new clients and then a new connection // otherwise, it would use client provided as CLI argument (-a-client) func (tr TestConfig) createIbcClientsHermes( - action createIbcClientsAction, + action CreateIbcClientsAction, verbose bool, ) { //#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments. @@ -941,7 +941,7 @@ func (tr TestConfig) createIbcClientsHermes( } func (tr TestConfig) addIbcConnectionHermes( - action addIbcConnectionAction, + action AddIbcConnectionAction, verbose bool, ) { //#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments. @@ -978,7 +978,7 @@ func (tr TestConfig) addIbcConnectionHermes( } } -type addIbcChannelAction struct { +type AddIbcChannelAction struct { ChainA ChainID ChainB ChainID ConnectionA uint @@ -988,10 +988,10 @@ type addIbcChannelAction struct { Version string } -type startRelayerAction struct{} +type StartRelayerAction struct{} func (tr TestConfig) startRelayer( - action startRelayerAction, + action StartRelayerAction, verbose bool, ) { if tr.useGorelayer { @@ -1002,7 +1002,7 @@ func (tr TestConfig) startRelayer( } func (tr TestConfig) startGorelayer( - action startRelayerAction, + action StartRelayerAction, verbose bool, ) { // gorelayer start is running in detached mode @@ -1021,7 +1021,7 @@ func (tr TestConfig) startGorelayer( } func (tr TestConfig) startHermes( - action startRelayerAction, + action StartRelayerAction, verbose bool, ) { // hermes start is running in detached mode @@ -1040,7 +1040,7 @@ func (tr TestConfig) startHermes( } func (tr TestConfig) addIbcChannel( - action addIbcChannelAction, + action AddIbcChannelAction, verbose bool, ) { if tr.useGorelayer { @@ -1051,7 +1051,7 @@ func (tr TestConfig) addIbcChannel( } func (tr TestConfig) addIbcChannelGorelayer( - action addIbcChannelAction, + action AddIbcChannelAction, verbose bool, ) { pathName := tr.GetPathNameForGorelayer(action.ChainA, action.ChainB) @@ -1069,7 +1069,7 @@ func (tr TestConfig) addIbcChannelGorelayer( } func (tr TestConfig) addIbcChannelHermes( - action addIbcChannelAction, + action AddIbcChannelAction, verbose bool, ) { // if version is not specified, use the default version when creating ccv connections @@ -1120,7 +1120,7 @@ func (tr TestConfig) addIbcChannelHermes( } } -type transferChannelCompleteAction struct { +type TransferChannelCompleteAction struct { ChainA ChainID ChainB ChainID ConnectionA uint @@ -1132,7 +1132,7 @@ type transferChannelCompleteAction struct { } func (tr TestConfig) transferChannelComplete( - action transferChannelCompleteAction, + action TransferChannelCompleteAction, verbose bool, ) { if tr.useGorelayer { @@ -1212,7 +1212,7 @@ func executeCommand(cmd *exec.Cmd, cmdName string) { executeCommandWithVerbosity(cmd, cmdName, *verbose) } -type relayPacketsAction struct { +type RelayPacketsAction struct { ChainA ChainID ChainB ChainID Port string @@ -1220,7 +1220,7 @@ type relayPacketsAction struct { } func (tr TestConfig) relayPackets( - action relayPacketsAction, + action RelayPacketsAction, verbose bool, ) { if tr.useGorelayer { @@ -1231,7 +1231,7 @@ func (tr TestConfig) relayPackets( } func (tr TestConfig) relayPacketsGorelayer( - action relayPacketsAction, + action RelayPacketsAction, verbose bool, ) { pathName := tr.GetPathNameForGorelayer(action.ChainA, action.ChainB) @@ -1255,7 +1255,7 @@ func (tr TestConfig) relayPacketsGorelayer( } func (tr TestConfig) relayPacketsHermes( - action relayPacketsAction, + action RelayPacketsAction, verbose bool, ) { // hermes clear packets ibc0 transfer channel-13 @@ -1278,7 +1278,7 @@ func (tr TestConfig) relayPacketsHermes( tr.waitBlocks(action.ChainB, 1, 30*time.Second) } -type relayRewardPacketsToProviderAction struct { +type RelayRewardPacketsToProviderAction struct { ConsumerChain ChainID ProviderChain ChainID Port string @@ -1286,7 +1286,7 @@ type relayRewardPacketsToProviderAction struct { } func (tr TestConfig) relayRewardPacketsToProvider( - action relayRewardPacketsToProviderAction, + action RelayRewardPacketsToProviderAction, verbose bool, ) { blockPerDistribution, _ := strconv.ParseUint(strings.Trim(tr.getParam(action.ConsumerChain, Param{Subspace: "ccvconsumer", Key: "BlocksPerDistributionTransmission"}), "\""), 10, 64) @@ -1295,11 +1295,11 @@ func (tr TestConfig) relayRewardPacketsToProvider( tr.waitBlocks(action.ConsumerChain, uint(blockPerDistribution-currentBlock+1), 60*time.Second) } - tr.relayPackets(relayPacketsAction{ChainA: action.ConsumerChain, ChainB: action.ProviderChain, Port: action.Port, Channel: action.Channel}, verbose) + tr.relayPackets(RelayPacketsAction{ChainA: action.ConsumerChain, ChainB: action.ProviderChain, Port: action.Port, Channel: action.Channel}, verbose) tr.waitBlocks(action.ProviderChain, 1, 10*time.Second) } -type delegateTokensAction struct { +type DelegateTokensAction struct { Chain ChainID From ValidatorID To ValidatorID @@ -1307,7 +1307,7 @@ type delegateTokensAction struct { } func (tr TestConfig) delegateTokens( - action delegateTokensAction, + action DelegateTokensAction, verbose bool, ) { toValCfg := tr.validatorConfigs[action.To] @@ -1343,7 +1343,7 @@ func (tr TestConfig) delegateTokens( tr.waitBlocks(action.Chain, 2, 10*time.Second) } -type unbondTokensAction struct { +type UnbondTokensAction struct { Chain ChainID Sender ValidatorID UnbondFrom ValidatorID @@ -1351,7 +1351,7 @@ type unbondTokensAction struct { } func (tr TestConfig) unbondTokens( - action unbondTokensAction, + action UnbondTokensAction, verbose bool, ) { unbondFrom := tr.validatorConfigs[action.UnbondFrom].ValoperAddress @@ -1388,7 +1388,7 @@ func (tr TestConfig) unbondTokens( tr.waitBlocks(action.Chain, 2, 20*time.Second) } -type cancelUnbondTokensAction struct { +type CancelUnbondTokensAction struct { Chain ChainID Delegator ValidatorID Validator ValidatorID @@ -1396,7 +1396,7 @@ type cancelUnbondTokensAction struct { } func (tr TestConfig) cancelUnbondTokens( - action cancelUnbondTokensAction, + action CancelUnbondTokensAction, verbose bool, ) { validator := tr.validatorConfigs[action.Validator].ValoperAddress @@ -1456,7 +1456,7 @@ func (tr TestConfig) cancelUnbondTokens( tr.waitBlocks(action.Chain, 2, 20*time.Second) } -type redelegateTokensAction struct { +type RedelegateTokensAction struct { Chain ChainID Src ValidatorID Dst ValidatorID @@ -1464,7 +1464,7 @@ type redelegateTokensAction struct { Amount uint } -func (tr TestConfig) redelegateTokens(action redelegateTokensAction, verbose bool) { +func (tr TestConfig) redelegateTokens(action RedelegateTokensAction, verbose bool) { srcCfg := tr.validatorConfigs[action.Src] dstCfg := tr.validatorConfigs[action.Dst] @@ -1509,7 +1509,7 @@ func (tr TestConfig) redelegateTokens(action redelegateTokensAction, verbose boo tr.waitBlocks(action.Chain, 2, 10*time.Second) } -type downtimeSlashAction struct { +type DowntimeSlashAction struct { Chain ChainID Validator ValidatorID } @@ -1528,7 +1528,7 @@ func (tr TestConfig) getValidatorKeyAddressFromString(keystring string) string { return key.Address } -func (tr TestConfig) invokeDowntimeSlash(action downtimeSlashAction, verbose bool) { +func (tr TestConfig) 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 @@ -1597,13 +1597,13 @@ func (tr TestConfig) GetValidatorPrivateKeyAddress(chain ChainID, validator Vali return validatorPrivateKeyAddress } -type unjailValidatorAction struct { +type UnjailValidatorAction struct { Provider ChainID Validator ValidatorID } // Sends an unjail transaction to the provider chain -func (tr TestConfig) unjailValidator(action unjailValidatorAction, verbose bool) { +func (tr TestConfig) unjailValidator(action UnjailValidatorAction, verbose bool) { // wait until downtime_jail_duration has elapsed, to make sure the validator can be unjailed tr.WaitTime(61 * time.Second) @@ -1636,14 +1636,14 @@ func (tr TestConfig) unjailValidator(action unjailValidatorAction, verbose bool) tr.waitBlocks(action.Provider, 2, time.Minute) } -type registerRepresentativeAction struct { +type RegisterRepresentativeAction struct { Chain ChainID Representatives []ValidatorID Stakes []uint } func (tr TestConfig) registerRepresentative( - action registerRepresentativeAction, + action RegisterRepresentativeAction, verbose bool, ) { var wg sync.WaitGroup @@ -1693,13 +1693,13 @@ func (tr TestConfig) registerRepresentative( wg.Wait() } -type submitChangeRewardDenomsProposalAction struct { +type SubmitChangeRewardDenomsProposalAction struct { Denom string Deposit uint From ValidatorID } -func (tr TestConfig) submitChangeRewardDenomsProposal(action submitChangeRewardDenomsProposalAction, verbose bool) { +func (tr TestConfig) submitChangeRewardDenomsProposal(action SubmitChangeRewardDenomsProposalAction, verbose bool) { providerChain := tr.chainConfigs[ChainID("provi")] prop := client.ChangeRewardDenomsProposalJSON{ @@ -1762,14 +1762,14 @@ func (tr TestConfig) submitChangeRewardDenomsProposal(action submitChangeRewardD // - reset priv_validator_state.json to initial values // - start the new node // Double sign should be registered within couple blocks. -type doublesignSlashAction struct { +type DoublesignSlashAction struct { // start another node for this Validator Validator ValidatorID Chain ChainID } func (tr TestConfig) invokeDoublesignSlash( - action doublesignSlashAction, + action DoublesignSlashAction, verbose bool, ) { if !tr.useCometmock { @@ -1800,13 +1800,13 @@ func (tr TestConfig) invokeDoublesignSlash( // The evidence will look like the validator equivocated to a light client. // See https://github.com/cometbft/cometbft/tree/main/spec/light-client/accountability // for more information about light client attacks. -type lightClientEquivocationAttackAction struct { +type LightClientEquivocationAttackAction struct { Validator ValidatorID Chain ChainID } func (tr TestConfig) lightClientEquivocationAttack( - action lightClientEquivocationAttackAction, + action LightClientEquivocationAttackAction, verbose bool, ) { tr.lightClientAttack(action.Validator, action.Chain, LightClientEquivocationAttack) @@ -1816,13 +1816,13 @@ func (tr TestConfig) lightClientEquivocationAttack( // The evidence will look like the validator tried to perform an amnesia attack. // See https://github.com/cometbft/cometbft/tree/main/spec/light-client/accountability // for more information about light client attacks. -type lightClientAmnesiaAttackAction struct { +type LightClientAmnesiaAttackAction struct { Validator ValidatorID Chain ChainID } func (tr TestConfig) lightClientAmnesiaAttack( - action lightClientAmnesiaAttackAction, + action LightClientAmnesiaAttackAction, verbose bool, ) { tr.lightClientAttack(action.Validator, action.Chain, LightClientAmnesiaAttack) @@ -1832,13 +1832,13 @@ func (tr TestConfig) lightClientAmnesiaAttack( // The evidence will look like the validator tried to perform a lunatic attack. // See https://github.com/cometbft/cometbft/tree/main/spec/light-client/accountability // for more information about light client attacks. -type lightClientLunaticAttackAction struct { +type LightClientLunaticAttackAction struct { Validator ValidatorID Chain ChainID } func (tr TestConfig) lightClientLunaticAttack( - action lightClientLunaticAttackAction, + action LightClientLunaticAttackAction, verbose bool, ) { tr.lightClientAttack(action.Validator, action.Chain, LightClientLunaticAttack) @@ -1871,7 +1871,7 @@ func (tr TestConfig) lightClientAttack( tr.waitBlocks(chain, 1, 10*time.Second) } -type assignConsumerPubKeyAction struct { +type AssignConsumerPubKeyAction struct { Chain ChainID Validator ValidatorID ConsumerPubkey string @@ -1882,7 +1882,7 @@ type assignConsumerPubKeyAction struct { ExpectedError string } -func (tr TestConfig) assignConsumerPubKey(action assignConsumerPubKeyAction, verbose bool) { +func (tr TestConfig) assignConsumerPubKey(action AssignConsumerPubKeyAction, verbose bool) { valCfg := tr.validatorConfigs[action.Validator] // Note: to get error response reported back from this command '--gas auto' needs to be set. @@ -1982,15 +1982,15 @@ func (tr TestConfig) assignConsumerPubKey(action assignConsumerPubKeyAction, ver tr.waitBlocks(ChainID("provi"), 2, 30*time.Second) } -// slashMeterReplenishmentAction polls the slash meter on provider until value is achieved -type slashMeterReplenishmentAction struct { +// SlashMeterReplenishmentAction polls the slash meter on provider until value is achieved +type SlashMeterReplenishmentAction struct { TargetValue int64 // panic if timeout is exceeded Timeout time.Duration } func (tr TestConfig) waitForSlashMeterReplenishment( - action slashMeterReplenishmentAction, + action SlashMeterReplenishmentAction, verbose bool, ) { timeout := time.Now().Add(action.Timeout) @@ -2019,12 +2019,12 @@ func (tr TestConfig) waitForSlashMeterReplenishment( } } -type waitTimeAction struct { +type WaitTimeAction struct { WaitTime time.Duration } func (tr TestConfig) waitForTime( - action waitTimeAction, + action WaitTimeAction, verbose bool, ) { tr.WaitTime(action.WaitTime) @@ -2048,12 +2048,12 @@ func (tr TestConfig) GetPathNameForGorelayer(chainA, chainB ChainID) string { // which detects evidences committed to the blocks of a consumer chain. // Each infraction detected is reported to the provider chain using // either a SubmitConsumerDoubleVoting or a SubmitConsumerMisbehaviour message. -type startConsumerEvidenceDetectorAction struct { +type StartConsumerEvidenceDetectorAction struct { Chain ChainID } func (tc TestConfig) startConsumerEvidenceDetector( - action startConsumerEvidenceDetectorAction, + action StartConsumerEvidenceDetectorAction, verbose bool, ) { chainConfig := tc.chainConfigs[action.Chain] diff --git a/tests/e2e/actions_consumer_misbehaviour.go b/tests/e2e/actions_consumer_misbehaviour.go index 7d71d58d1d..056050b66d 100644 --- a/tests/e2e/actions_consumer_misbehaviour.go +++ b/tests/e2e/actions_consumer_misbehaviour.go @@ -8,16 +8,16 @@ import ( "time" ) -// forkConsumerChainAction forks the consumer chain by cloning of a validator node +// ForkConsumerChainAction forks the consumer chain by cloning of a validator node // Note that the chain fork is running in an different network -type forkConsumerChainAction struct { +type ForkConsumerChainAction struct { ConsumerChain ChainID ProviderChain ChainID Validator ValidatorID RelayerConfig string } -func (tc TestConfig) forkConsumerChain(action forkConsumerChainAction, verbose bool) { +func (tc TestConfig) forkConsumerChain(action ForkConsumerChainAction, verbose bool) { valCfg := tc.validatorConfigs[action.Validator] //#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments. @@ -62,7 +62,7 @@ func (tc TestConfig) forkConsumerChain(action forkConsumerChainAction, verbose b time.Sleep(5 * time.Second) } -type updateLightClientAction struct { +type UpdateLightClientAction struct { Chain ChainID HostChain ChainID RelayerConfig string @@ -70,7 +70,7 @@ type updateLightClientAction struct { } func (tc TestConfig) updateLightClient( - action updateLightClientAction, + action UpdateLightClientAction, verbose bool, ) { // retrieve a trusted height of the consumer light client @@ -86,7 +86,7 @@ func (tc TestConfig) updateLightClient( "--trusted-height", strconv.Itoa(int(trustedHeight.RevisionHeight)), ) if verbose { - log.Println("updateLightClientAction cmd:", cmd.String()) + log.Println("UpdateLightClientAction cmd:", cmd.String()) } bz, err := cmd.CombinedOutput() diff --git a/tests/e2e/actions_sovereign_chain.go b/tests/e2e/actions_sovereign_chain.go index af5f6abab3..9a5bb0f182 100644 --- a/tests/e2e/actions_sovereign_chain.go +++ b/tests/e2e/actions_sovereign_chain.go @@ -99,7 +99,7 @@ func (tr TestConfig) startSovereignChain( if err := scanner.Err(); err != nil { log.Fatal(err) } - tr.addChainToRelayer(addChainToRelayerAction{ + tr.addChainToRelayer(AddChainToRelayerAction{ Chain: action.Chain, Validator: action.Validators[0].Id, }, verbose) @@ -156,12 +156,12 @@ func (tr *TestConfig) submitLegacyUpgradeProposal(action LegacyUpgradeProposalAc tr.waitBlocks(action.ChainID, 1, 15*time.Second) } -type waitUntilBlockAction struct { +type WaitUntilBlockAction struct { Block uint Chain ChainID } -func (tr *TestConfig) waitUntilBlockOnChain(action waitUntilBlockAction) { +func (tr *TestConfig) waitUntilBlockOnChain(action WaitUntilBlockAction) { fmt.Println("waitUntilBlockOnChain is waiting for block:", action.Block) tr.waitUntilBlock(action.Chain, action.Block, 120*time.Second) fmt.Println("waitUntilBlockOnChain done waiting for block:", action.Block) diff --git a/tests/e2e/json_utils.go b/tests/e2e/json_utils.go index 3155bba069..aeb59eee3a 100644 --- a/tests/e2e/json_utils.go +++ b/tests/e2e/json_utils.go @@ -65,8 +65,8 @@ func (step *Step) UnmarshalJSON(data []byte) error { func UnmarshalMapToActionType(rawAction json.RawMessage, actionTypeString string) (interface{}, error) { var err error switch actionTypeString { - case "main.submitConsumerAdditionProposalAction": - var a submitConsumerAdditionProposalAction + case "main.SubmitConsumerAdditionProposalAction": + var a SubmitConsumerAdditionProposalAction err = json.Unmarshal(rawAction, &a) if err == nil { return a, nil @@ -83,152 +83,152 @@ func UnmarshalMapToActionType(rawAction json.RawMessage, actionTypeString string if err == nil { return a, nil } - case "main.submitTextProposalAction": - var a submitTextProposalAction + case "main.SubmitTextProposalAction": + var a SubmitTextProposalAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.submitConsumerRemovalProposalAction": - var a submitConsumerRemovalProposalAction + case "main.SubmitConsumerRemovalProposalAction": + var a SubmitConsumerRemovalProposalAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.submitParamChangeLegacyProposalAction": - var a submitParamChangeLegacyProposalAction + case "main.SubmitParamChangeLegacyProposalAction": + var a SubmitParamChangeLegacyProposalAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.voteGovProposalAction": - var a voteGovProposalAction + case "main.VoteGovProposalAction": + var a VoteGovProposalAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.startConsumerChainAction": - var a startConsumerChainAction + case "main.StartConsumerChainAction": + var a StartConsumerChainAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.addChainToRelayerAction": - var a addChainToRelayerAction + case "main.AddChainToRelayerAction": + var a AddChainToRelayerAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.addIbcConnectionAction": - var a addIbcConnectionAction + case "main.AddIbcConnectionAction": + var a AddIbcConnectionAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.addIbcChannelAction": - var a addIbcChannelAction + case "main.AddIbcChannelAction": + var a AddIbcChannelAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.transferChannelCompleteAction": - var a transferChannelCompleteAction + case "main.TransferChannelCompleteAction": + var a TransferChannelCompleteAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.unjailValidatorAction": - var a unjailValidatorAction + case "main.UnjailValidatorAction": + var a UnjailValidatorAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.assignConsumerPubKeyAction": - var a assignConsumerPubKeyAction + case "main.AssignConsumerPubKeyAction": + var a AssignConsumerPubKeyAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.delegateTokensAction": - var a delegateTokensAction + case "main.DelegateTokensAction": + var a DelegateTokensAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.relayPacketsAction": - var a relayPacketsAction + case "main.RelayPacketsAction": + var a RelayPacketsAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.registerRepresentativeAction": - var a registerRepresentativeAction + case "main.RegisterRepresentativeAction": + var a RegisterRepresentativeAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.relayRewardPacketsToProviderAction": - var a relayRewardPacketsToProviderAction + case "main.RelayRewardPacketsToProviderAction": + var a RelayRewardPacketsToProviderAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.submitChangeRewardDenomsProposalAction": - var a submitChangeRewardDenomsProposalAction + case "main.SubmitChangeRewardDenomsProposalAction": + var a SubmitChangeRewardDenomsProposalAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.downtimeSlashAction": - var a downtimeSlashAction + case "main.DowntimeSlashAction": + var a DowntimeSlashAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.unbondTokensAction": - var a unbondTokensAction + case "main.UnbondTokensAction": + var a UnbondTokensAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.cancelUnbondTokensAction": - var a cancelUnbondTokensAction + case "main.CancelUnbondTokensAction": + var a CancelUnbondTokensAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.redelegateTokensAction": - var a redelegateTokensAction + case "main.RedelegateTokensAction": + var a RedelegateTokensAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.doublesignSlashAction": - var a doublesignSlashAction + case "main.DoublesignSlashAction": + var a DoublesignSlashAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.startRelayerAction": - var a startRelayerAction + case "main.StartRelayerAction": + var a StartRelayerAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.slashMeterReplenishmentAction": - var a slashMeterReplenishmentAction + case "main.SlashMeterReplenishmentAction": + var a SlashMeterReplenishmentAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.waitTimeAction": - var a waitTimeAction + case "main.WaitTimeAction": + var a WaitTimeAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.createIbcClientsAction": - var a createIbcClientsAction + case "main.CreateIbcClientsAction": + var a CreateIbcClientsAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil @@ -239,8 +239,8 @@ func UnmarshalMapToActionType(rawAction json.RawMessage, actionTypeString string if err == nil { return a, nil } - case "main.waitUntilBlockAction": - var a waitUntilBlockAction + case "main.WaitUntilBlockAction": + var a WaitUntilBlockAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil @@ -257,38 +257,38 @@ func UnmarshalMapToActionType(rawAction json.RawMessage, actionTypeString string if err == nil { return a, nil } - case "main.lightClientEquivocationAttackAction": - var a lightClientEquivocationAttackAction + case "main.LightClientEquivocationAttackAction": + var a LightClientEquivocationAttackAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.lightClientAmnesiaAttackAction": - var a lightClientAmnesiaAttackAction + case "main.LightClientAmnesiaAttackAction": + var a LightClientAmnesiaAttackAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.lightClientLunaticAttackAction": - var a lightClientLunaticAttackAction + case "main.LightClientLunaticAttackAction": + var a LightClientLunaticAttackAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.forkConsumerChainAction": - var a forkConsumerChainAction + case "main.ForkConsumerChainAction": + var a ForkConsumerChainAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.startConsumerEvidenceDetectorAction": - var a startConsumerEvidenceDetectorAction + case "main.StartConsumerEvidenceDetectorAction": + var a StartConsumerEvidenceDetectorAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil } - case "main.updateLightClientAction": - var a updateLightClientAction + case "main.UpdateLightClientAction": + var a UpdateLightClientAction err := json.Unmarshal(rawAction, &a) if err == nil { return a, nil diff --git a/tests/e2e/main.go b/tests/e2e/main.go index 7261dd2ea6..21864ed650 100644 --- a/tests/e2e/main.go +++ b/tests/e2e/main.go @@ -334,75 +334,75 @@ func (tr *TestConfig) runStep(step Step, verbose bool) { tr.startSovereignChain(action, verbose) case LegacyUpgradeProposalAction: tr.submitLegacyUpgradeProposal(action, verbose) - case waitUntilBlockAction: + case WaitUntilBlockAction: tr.waitUntilBlockOnChain(action) case ChangeoverChainAction: tr.changeoverChain(action, verbose) case SendTokensAction: tr.sendTokens(action, verbose) - case submitTextProposalAction: + case SubmitTextProposalAction: tr.submitTextProposal(action, verbose) - case submitConsumerAdditionProposalAction: + case SubmitConsumerAdditionProposalAction: tr.submitConsumerAdditionProposal(action, verbose) - case submitConsumerRemovalProposalAction: + case SubmitConsumerRemovalProposalAction: tr.submitConsumerRemovalProposal(action, verbose) - case submitParamChangeLegacyProposalAction: + case SubmitParamChangeLegacyProposalAction: tr.submitParamChangeProposal(action, verbose) - case voteGovProposalAction: + case VoteGovProposalAction: tr.voteGovProposal(action, verbose) - case startConsumerChainAction: + case StartConsumerChainAction: tr.startConsumerChain(action, verbose) - case addChainToRelayerAction: + case AddChainToRelayerAction: tr.addChainToRelayer(action, verbose) - case createIbcClientsAction: + case CreateIbcClientsAction: tr.createIbcClientsHermes(action, verbose) - case addIbcConnectionAction: + case AddIbcConnectionAction: tr.addIbcConnection(action, verbose) - case addIbcChannelAction: + case AddIbcChannelAction: tr.addIbcChannel(action, verbose) - case transferChannelCompleteAction: + case TransferChannelCompleteAction: tr.transferChannelComplete(action, verbose) - case relayPacketsAction: + case RelayPacketsAction: tr.relayPackets(action, verbose) - case relayRewardPacketsToProviderAction: + case RelayRewardPacketsToProviderAction: tr.relayRewardPacketsToProvider(action, verbose) - case delegateTokensAction: + case DelegateTokensAction: tr.delegateTokens(action, verbose) - case unbondTokensAction: + case UnbondTokensAction: tr.unbondTokens(action, verbose) - case cancelUnbondTokensAction: + case CancelUnbondTokensAction: tr.cancelUnbondTokens(action, verbose) - case redelegateTokensAction: + case RedelegateTokensAction: tr.redelegateTokens(action, verbose) - case downtimeSlashAction: + case DowntimeSlashAction: tr.invokeDowntimeSlash(action, verbose) - case unjailValidatorAction: + case UnjailValidatorAction: tr.unjailValidator(action, verbose) - case doublesignSlashAction: + case DoublesignSlashAction: tr.invokeDoublesignSlash(action, verbose) - case lightClientAmnesiaAttackAction: + case LightClientAmnesiaAttackAction: tr.lightClientAmnesiaAttack(action, verbose) - case lightClientEquivocationAttackAction: + case LightClientEquivocationAttackAction: tr.lightClientEquivocationAttack(action, verbose) - case lightClientLunaticAttackAction: + case LightClientLunaticAttackAction: tr.lightClientLunaticAttack(action, verbose) - case registerRepresentativeAction: + case RegisterRepresentativeAction: tr.registerRepresentative(action, verbose) - case assignConsumerPubKeyAction: + case AssignConsumerPubKeyAction: tr.assignConsumerPubKey(action, verbose) - case slashMeterReplenishmentAction: + case SlashMeterReplenishmentAction: tr.waitForSlashMeterReplenishment(action, verbose) - case waitTimeAction: + case WaitTimeAction: tr.waitForTime(action, verbose) - case startRelayerAction: + case StartRelayerAction: tr.startRelayer(action, verbose) - case forkConsumerChainAction: + case ForkConsumerChainAction: tr.forkConsumerChain(action, verbose) - case updateLightClientAction: + case UpdateLightClientAction: tr.updateLightClient(action, verbose) - case startConsumerEvidenceDetectorAction: + case StartConsumerEvidenceDetectorAction: tr.startConsumerEvidenceDetector(action, verbose) - case submitChangeRewardDenomsProposalAction: + case SubmitChangeRewardDenomsProposalAction: tr.submitChangeRewardDenomsProposal(action, verbose) default: log.Fatalf("unknown action in testRun %s: %#v", tr.name, action) diff --git a/tests/e2e/step_delegation.go b/tests/e2e/step_delegation.go index fc3208dbac..102ee76fa2 100644 --- a/tests/e2e/step_delegation.go +++ b/tests/e2e/step_delegation.go @@ -4,7 +4,7 @@ package main func stepsDelegate(consumerName string) []Step { return []Step{ { - Action: delegateTokensAction{ + Action: DelegateTokensAction{ Chain: ChainID("provi"), From: ValidatorID("alice"), To: ValidatorID("alice"), @@ -45,7 +45,7 @@ func stepsDelegate(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -85,7 +85,7 @@ func stepsDelegate(consumerName string) []Step { func stepsUnbond(consumerName string) []Step { return []Step{ { - Action: unbondTokensAction{ + Action: UnbondTokensAction{ Chain: ChainID("provi"), UnbondFrom: ValidatorID("alice"), Sender: ValidatorID("alice"), @@ -110,7 +110,7 @@ func stepsUnbond(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -134,7 +134,7 @@ func stepsUnbond(consumerName string) []Step { func stepsCancelUnbond(consumerName string) []Step { return []Step{ { - Action: unbondTokensAction{ + Action: UnbondTokensAction{ Chain: ChainID("provi"), UnbondFrom: ValidatorID("alice"), Sender: ValidatorID("alice"), @@ -159,7 +159,7 @@ func stepsCancelUnbond(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -176,7 +176,7 @@ func stepsCancelUnbond(consumerName string) []Step { }, }, { - Action: cancelUnbondTokensAction{ + Action: CancelUnbondTokensAction{ Chain: ChainID("provi"), Delegator: ValidatorID("alice"), Validator: ValidatorID("alice"), @@ -201,7 +201,7 @@ func stepsCancelUnbond(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -226,7 +226,7 @@ func stepsCancelUnbond(consumerName string) []Step { func stepsRedelegateForOptOut(consumerName string) []Step { return []Step{ { - Action: redelegateTokensAction{ + Action: RedelegateTokensAction{ Chain: ChainID("provi"), Src: ValidatorID("alice"), Dst: ValidatorID("carol"), @@ -252,7 +252,7 @@ func stepsRedelegateForOptOut(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -276,7 +276,7 @@ func stepsRedelegateForOptOut(consumerName string) []Step { func stepsRedelegate(consumerName string) []Step { return []Step{ { - Action: redelegateTokensAction{ + Action: RedelegateTokensAction{ Chain: ChainID("provi"), Src: ValidatorID("carol"), Dst: ValidatorID("alice"), @@ -305,7 +305,7 @@ func stepsRedelegate(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -329,7 +329,7 @@ func stepsRedelegate(consumerName string) []Step { func stepsRedelegateShort(consumerName string) []Step { return []Step{ { - Action: redelegateTokensAction{ + Action: RedelegateTokensAction{ Chain: ChainID("provi"), Src: ValidatorID("alice"), Dst: ValidatorID("carol"), @@ -358,7 +358,7 @@ func stepsRedelegateShort(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", diff --git a/tests/e2e/steps_consumer_misbehaviour.go b/tests/e2e/steps_consumer_misbehaviour.go index 01d05f658d..f63c070c84 100644 --- a/tests/e2e/steps_consumer_misbehaviour.go +++ b/tests/e2e/steps_consumer_misbehaviour.go @@ -29,7 +29,7 @@ func stepsStartChainsWithSoftOptOut(consumerName string) []Step { }, }, { - Action: submitConsumerAdditionProposalAction{ + Action: SubmitConsumerAdditionProposalAction{ Chain: ChainID("provi"), From: ValidatorID("alice"), Deposit: 10000001, @@ -58,7 +58,7 @@ func stepsStartChainsWithSoftOptOut(consumerName string) []Step { // add a consumer key before the chain starts // the key will be present in consumer genesis initial_val_set { - Action: assignConsumerPubKeyAction{ + Action: AssignConsumerPubKeyAction{ Chain: ChainID(consumerName), Validator: ValidatorID("alice"), ConsumerPubkey: `{"@type":"/cosmos.crypto.ed25519.PubKey","key":"ujY14AgopV907IYgPAk/5x8c9267S4fQf89nyeCPTes="}`, @@ -79,7 +79,7 @@ func stepsStartChainsWithSoftOptOut(consumerName string) []Step { }, }, { - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID("provi"), From: []ValidatorID{ValidatorID("alice"), ValidatorID("bob")}, Vote: []string{"yes", "yes"}, @@ -106,7 +106,7 @@ func stepsStartChainsWithSoftOptOut(consumerName string) []Step { { // start a consumer chain using a single big validator knowing that it holds more than 2/3 of the voting power // and that the other validators hold less than 5% so they won't get jailed thanks to the sof opt-out mechanism. - Action: startConsumerChainAction{ + Action: StartConsumerChainAction{ ConsumerChain: ChainID(consumerName), ProviderChain: ChainID("provi"), Validators: []StartChainValidator{ @@ -134,7 +134,7 @@ func stepsStartChainsWithSoftOptOut(consumerName string) []Step { }, }, { - Action: addIbcConnectionAction{ + Action: AddIbcConnectionAction{ ChainA: ChainID(consumerName), ChainB: ChainID("provi"), ClientA: 0, @@ -143,7 +143,7 @@ func stepsStartChainsWithSoftOptOut(consumerName string) []Step { State: State{}, }, { - Action: addIbcChannelAction{ + Action: AddIbcChannelAction{ ChainA: ChainID(consumerName), ChainB: ChainID("provi"), ConnectionA: 0, @@ -156,7 +156,7 @@ func stepsStartChainsWithSoftOptOut(consumerName string) []Step { // delegate some token and relay the resulting VSC packets // in oder to initiates the CCV channel { - Action: delegateTokensAction{ + Action: DelegateTokensAction{ Chain: ChainID("provi"), From: ValidatorID("alice"), To: ValidatorID("alice"), @@ -178,7 +178,7 @@ func stepsStartChainsWithSoftOptOut(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -205,7 +205,7 @@ func stepsCauseConsumerMisbehaviour(consumerName string) []Step { return []Step{ { // fork the consumer chain by cloning the alice validator node - Action: forkConsumerChainAction{ + Action: ForkConsumerChainAction{ ConsumerChain: ChainID(consumerName), ProviderChain: ChainID("provi"), Validator: ValidatorID("alice"), @@ -215,13 +215,13 @@ func stepsCauseConsumerMisbehaviour(consumerName string) []Step { }, // start relayer to detect IBC misbehaviour { - Action: startRelayerAction{}, + Action: StartRelayerAction{}, State: State{}, }, // run Hermes relayer instance to detect the ICS misbehaviour // and jail alice on the provider { - Action: startConsumerEvidenceDetectorAction{ + Action: StartConsumerEvidenceDetectorAction{ Chain: ChainID(consumerName), }, State: State{ @@ -246,7 +246,7 @@ func stepsCauseConsumerMisbehaviour(consumerName string) []Step { { // update the fork consumer client to create a light client attack // which should trigger a ICS misbehaviour message - Action: updateLightClientAction{ + Action: UpdateLightClientAction{ Chain: ChainID(consumerName), ClientID: consumerClientID, HostChain: ChainID("provi"), diff --git a/tests/e2e/steps_democracy.go b/tests/e2e/steps_democracy.go index 9605f8698a..506b33453c 100644 --- a/tests/e2e/steps_democracy.go +++ b/tests/e2e/steps_democracy.go @@ -5,7 +5,7 @@ const consumerRewardDenom = "ibc/3C3D7B3BE4ECC85A0E5B52A3AEC3B7DFC2AA9CA47C37821 func stepsDemocracy(consumerName string) []Step { return []Step{ { - Action: registerRepresentativeAction{ + Action: RegisterRepresentativeAction{ Chain: ChainID(consumerName), Representatives: []ValidatorID{ValidatorID("alice"), ValidatorID("bob")}, Stakes: []uint{100000000, 40000000}, @@ -29,7 +29,7 @@ func stepsDemocracy(consumerName string) []Step { }, }, { - Action: delegateTokensAction{ + Action: DelegateTokensAction{ Chain: ChainID(consumerName), From: ValidatorID("carol"), To: ValidatorID("alice"), @@ -63,7 +63,7 @@ func stepsDemocracy(consumerName string) []Step { }, { // whitelisted legacy proposal can only handle ibctransfer.SendEnabled/ReceiveEnabled - Action: submitParamChangeLegacyProposalAction{ + Action: SubmitParamChangeLegacyProposalAction{ Chain: ChainID(consumerName), From: ValidatorID("alice"), Deposit: 10000001, @@ -93,7 +93,7 @@ func stepsDemocracy(consumerName string) []Step { }, { // Have accounts vote on something on the gov-consumer chain - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID(consumerName), From: []ValidatorID{ValidatorID("alice"), ValidatorID("bob")}, Vote: []string{"yes", "no"}, @@ -122,7 +122,7 @@ func stepsDemocracy(consumerName string) []Step { }, }, { - Action: relayRewardPacketsToProviderAction{ + Action: RelayRewardPacketsToProviderAction{ ConsumerChain: ChainID(consumerName), ProviderChain: ChainID("provi"), Port: "transfer", @@ -146,7 +146,7 @@ func stepsDemocracy(consumerName string) []Step { }, }, { - Action: submitChangeRewardDenomsProposalAction{ + Action: SubmitChangeRewardDenomsProposalAction{ Denom: consumerRewardDenom, Deposit: 10000001, From: ValidatorID("bob"), @@ -159,7 +159,7 @@ func stepsDemocracy(consumerName string) []Step { }, }, { - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID("provi"), From: []ValidatorID{ValidatorID("alice"), ValidatorID("bob"), ValidatorID("carol")}, Vote: []string{"yes", "yes", "yes"}, @@ -173,7 +173,7 @@ func stepsDemocracy(consumerName string) []Step { }, }, { - Action: relayRewardPacketsToProviderAction{ + Action: RelayRewardPacketsToProviderAction{ ConsumerChain: ChainID(consumerName), ProviderChain: ChainID("provi"), Port: "transfer", @@ -195,7 +195,7 @@ func stepsDemocracy(consumerName string) []Step { }, }, { - Action: downtimeSlashAction{ + Action: DowntimeSlashAction{ Chain: ChainID(consumerName), Validator: ValidatorID("bob"), }, @@ -218,7 +218,7 @@ func stepsDemocracy(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -245,7 +245,7 @@ func stepsDemocracy(consumerName string) []Step { // A block is incremented each action, hence why VSC is committed on provider, // and can now be relayed as packet to consumer { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -263,7 +263,7 @@ func stepsDemocracy(consumerName string) []Step { }, }, { - Action: unjailValidatorAction{ + Action: UnjailValidatorAction{ Provider: ChainID("provi"), Validator: ValidatorID("bob"), }, @@ -285,7 +285,7 @@ func stepsDemocracy(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", diff --git a/tests/e2e/steps_double_sign.go b/tests/e2e/steps_double_sign.go index 8039098f36..353de13761 100644 --- a/tests/e2e/steps_double_sign.go +++ b/tests/e2e/steps_double_sign.go @@ -5,7 +5,7 @@ func stepsDoubleSignOnProvider(consumerName string) []Step { return []Step{ { // provider double sign - Action: doublesignSlashAction{ + Action: DoublesignSlashAction{ Chain: ChainID("provi"), Validator: ValidatorID("carol"), }, @@ -29,7 +29,7 @@ func stepsDoubleSignOnProvider(consumerName string) []Step { }, { // relay power change to consumerName - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -59,7 +59,7 @@ func stepsDoubleSignOnProvider(consumerName string) []Step { func stepsCauseDoubleSignOnConsumer(consumerName, providerName string) []Step { return []Step{ { - Action: doublesignSlashAction{ + Action: DoublesignSlashAction{ Chain: ChainID(consumerName), Validator: ValidatorID("bob"), }, @@ -88,7 +88,7 @@ func stepsCauseDoubleSignOnConsumer(consumerName, providerName string) []Step { // detect the double voting infraction // and jail and slashing of bob on the provider { - Action: startConsumerEvidenceDetectorAction{ + Action: StartConsumerEvidenceDetectorAction{ Chain: ChainID(consumerName), }, State: State{ @@ -117,7 +117,7 @@ func stepsCauseDoubleSignOnConsumer(consumerName, providerName string) []Step { }, // consumer learns about the jailing { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID(providerName), ChainB: ChainID(consumerName), Port: "provider", diff --git a/tests/e2e/steps_downtime.go b/tests/e2e/steps_downtime.go index f8a610052d..f63d0a31c9 100644 --- a/tests/e2e/steps_downtime.go +++ b/tests/e2e/steps_downtime.go @@ -15,7 +15,7 @@ import "time" func stepsDowntime(consumerName string) []Step { return []Step{ { - Action: downtimeSlashAction{ + Action: DowntimeSlashAction{ Chain: ChainID(consumerName), Validator: ValidatorID("bob"), }, @@ -38,7 +38,7 @@ func stepsDowntime(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -66,7 +66,7 @@ func stepsDowntime(consumerName string) []Step { // A block is incremented each action, hence why VSC is committed on provider, // and can now be relayed as packet to consumer { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -84,7 +84,7 @@ func stepsDowntime(consumerName string) []Step { }, }, { - Action: unjailValidatorAction{ + Action: UnjailValidatorAction{ Provider: ChainID("provi"), Validator: ValidatorID("bob"), }, @@ -108,7 +108,7 @@ func stepsDowntime(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -128,7 +128,7 @@ func stepsDowntime(consumerName string) []Step { }, // Now we test provider initiated downtime/slashing { - Action: downtimeSlashAction{ + Action: DowntimeSlashAction{ Chain: ChainID("provi"), Validator: ValidatorID("carol"), }, @@ -153,7 +153,7 @@ func stepsDowntime(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -170,7 +170,7 @@ func stepsDowntime(consumerName string) []Step { }, }, { - Action: unjailValidatorAction{ + Action: UnjailValidatorAction{ Provider: ChainID("provi"), Validator: ValidatorID("carol"), }, @@ -192,7 +192,7 @@ func stepsDowntime(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -218,7 +218,7 @@ func stepsDowntime(consumerName string) []Step { func stepsDowntimeWithOptOut(consumerName string) []Step { return []Step{ { - Action: downtimeSlashAction{ + Action: DowntimeSlashAction{ Chain: ChainID(consumerName), Validator: ValidatorID("alice"), }, @@ -241,7 +241,7 @@ func stepsDowntimeWithOptOut(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -274,7 +274,7 @@ func stepsDowntimeWithOptOut(consumerName string) []Step { func stepsThrottledDowntime(consumerName string) []Step { return []Step{ { - Action: downtimeSlashAction{ + Action: DowntimeSlashAction{ Chain: ChainID(consumerName), Validator: ValidatorID("bob"), }, @@ -301,7 +301,7 @@ func stepsThrottledDowntime(consumerName string) []Step { // and consumer receives ack that provider recv the downtime slash. // The latter is necessary for the consumer to send the second downtime slash. { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -328,7 +328,7 @@ func stepsThrottledDowntime(consumerName string) []Step { }, // Invoke carol downtime slash on consumer { - Action: downtimeSlashAction{ + Action: DowntimeSlashAction{ Chain: ChainID(consumerName), Validator: ValidatorID("carol"), }, @@ -352,7 +352,7 @@ func stepsThrottledDowntime(consumerName string) []Step { }, // Relay slash packet to provider, and ack back to consumer { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -377,7 +377,7 @@ func stepsThrottledDowntime(consumerName string) []Step { }, }, { - Action: slashMeterReplenishmentAction{ + Action: SlashMeterReplenishmentAction{ TargetValue: 0, // We just want slash meter to be non-negative // Slash meter replenish fraction is set to 10%, replenish period is 20 seconds, see config.go @@ -408,7 +408,7 @@ func stepsThrottledDowntime(consumerName string) []Step { // Retry delay period is set to 30 seconds, see config.go, // wait this amount of time to elapse the period. { - Action: waitTimeAction{ + Action: WaitTimeAction{ WaitTime: 30 * time.Second, }, State: State{ @@ -426,7 +426,7 @@ func stepsThrottledDowntime(consumerName string) []Step { }, // Relay now that retry delay period has passed, confirm provider applies jailing { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", diff --git a/tests/e2e/steps_light_client_attack.go b/tests/e2e/steps_light_client_attack.go index 1d9f484b5c..65481157b1 100644 --- a/tests/e2e/steps_light_client_attack.go +++ b/tests/e2e/steps_light_client_attack.go @@ -5,7 +5,7 @@ func stepsLightClientAttackOnProviderAndConsumer(consumerName string) []Step { return []Step{ { // Provider double sign - Action: lightClientEquivocationAttackAction{ + Action: LightClientEquivocationAttackAction{ Chain: ChainID("provi"), Validator: ValidatorID("carol"), }, @@ -29,7 +29,7 @@ func stepsLightClientAttackOnProviderAndConsumer(consumerName string) []Step { }, { // Relay power change to consumerName - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -55,7 +55,7 @@ func stepsLightClientAttackOnProviderAndConsumer(consumerName string) []Step { { // Consumer double sign // Provider will only log the double sign slash - Action: lightClientEquivocationAttackAction{ + Action: LightClientEquivocationAttackAction{ Chain: ChainID(consumerName), Validator: ValidatorID("bob"), }, @@ -77,7 +77,7 @@ func stepsLightClientAttackOnProviderAndConsumer(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -102,7 +102,7 @@ func stepsLightClientAttackOnProviderAndConsumer(consumerName string) []Step { }, { // Consumer learns about the double sign - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", diff --git a/tests/e2e/steps_multi_consumer_delegation.go b/tests/e2e/steps_multi_consumer_delegation.go index 67368e277c..734338edbc 100644 --- a/tests/e2e/steps_multi_consumer_delegation.go +++ b/tests/e2e/steps_multi_consumer_delegation.go @@ -5,7 +5,7 @@ func stepsMultiConsumerDelegate(consumer1, consumer2 string) []Step { return []Step{ { // changes not visible on any consumer - Action: delegateTokensAction{ + Action: DelegateTokensAction{ Chain: ChainID("provi"), From: ValidatorID("alice"), To: ValidatorID("alice"), @@ -37,7 +37,7 @@ func stepsMultiConsumerDelegate(consumer1, consumer2 string) []Step { }, { // relay changes to consumer1 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -69,7 +69,7 @@ func stepsMultiConsumerDelegate(consumer1, consumer2 string) []Step { }, { // relay changes to consumer2 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer2), Port: "provider", @@ -107,7 +107,7 @@ func stepsMultiConsumerDelegate(consumer1, consumer2 string) []Step { func stepsMultiConsumerUnbond(consumer1, consumer2 string) []Step { return []Step{ { - Action: unbondTokensAction{ + Action: UnbondTokensAction{ Chain: ChainID("provi"), UnbondFrom: ValidatorID("alice"), Sender: ValidatorID("alice"), @@ -139,7 +139,7 @@ func stepsMultiConsumerUnbond(consumer1, consumer2 string) []Step { }, { // relay to consumer1 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -171,7 +171,7 @@ func stepsMultiConsumerUnbond(consumer1, consumer2 string) []Step { }, { // relay to consumer2 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer2), Port: "provider", @@ -209,7 +209,7 @@ func stepsMultiConsumerUnbond(consumer1, consumer2 string) []Step { func stepsMultiConsumerRedelegate(consumer1, consumer2 string) []Step { return []Step{ { - Action: redelegateTokensAction{ + Action: RedelegateTokensAction{ Chain: ChainID("provi"), Src: ValidatorID("alice"), Dst: ValidatorID("carol"), @@ -245,7 +245,7 @@ func stepsMultiConsumerRedelegate(consumer1, consumer2 string) []Step { { // relay to consumer1 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -277,7 +277,7 @@ func stepsMultiConsumerRedelegate(consumer1, consumer2 string) []Step { }, { // relay to consumer2 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer2), Port: "provider", diff --git a/tests/e2e/steps_multi_consumer_double_sign.go b/tests/e2e/steps_multi_consumer_double_sign.go index 5388ea5c75..65bdd95328 100644 --- a/tests/e2e/steps_multi_consumer_double_sign.go +++ b/tests/e2e/steps_multi_consumer_double_sign.go @@ -13,7 +13,7 @@ func stepsMultiConsumerDoubleSign(consumer1, consumer2 string) []Step { return []Step{ { // provider double sign - Action: doublesignSlashAction{ + Action: DoublesignSlashAction{ Chain: ChainID("provi"), Validator: ValidatorID("carol"), }, @@ -44,7 +44,7 @@ func stepsMultiConsumerDoubleSign(consumer1, consumer2 string) []Step { }, { // relay power change to consumer1 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -76,7 +76,7 @@ func stepsMultiConsumerDoubleSign(consumer1, consumer2 string) []Step { }, { // relay power change to consumer2 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer2), Port: "provider", @@ -109,7 +109,7 @@ func stepsMultiConsumerDoubleSign(consumer1, consumer2 string) []Step { { // consumer double sign // nothing should happen - double sign from consumer is dropped - Action: doublesignSlashAction{ + Action: DoublesignSlashAction{ Chain: ChainID("consu"), Validator: ValidatorID("bob"), }, @@ -138,7 +138,7 @@ func stepsMultiConsumerDoubleSign(consumer1, consumer2 string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -170,7 +170,7 @@ func stepsMultiConsumerDoubleSign(consumer1, consumer2 string) []Step { }, { // consumer1 learns about the double sign - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -202,7 +202,7 @@ func stepsMultiConsumerDoubleSign(consumer1, consumer2 string) []Step { }, { // consumer2 learns about the double sign - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer2), Port: "provider", diff --git a/tests/e2e/steps_multi_consumer_downtime.go b/tests/e2e/steps_multi_consumer_downtime.go index eba44ed361..7e73197b8f 100644 --- a/tests/e2e/steps_multi_consumer_downtime.go +++ b/tests/e2e/steps_multi_consumer_downtime.go @@ -7,7 +7,7 @@ package main func stepsMultiConsumerDowntimeFromConsumer(consumer1, consumer2 string) []Step { return []Step{ { - Action: downtimeSlashAction{ + Action: DowntimeSlashAction{ Chain: ChainID(consumer1), Validator: ValidatorID("bob"), }, @@ -39,7 +39,7 @@ func stepsMultiConsumerDowntimeFromConsumer(consumer1, consumer2 string) []Step { // Downtime jailing and corresponding voting power change are processed by provider // Validator powers are unchanged on consumer chains - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -73,7 +73,7 @@ func stepsMultiConsumerDowntimeFromConsumer(consumer1, consumer2 string) []Step // A block is incremented each action, hence why VSC is committed on provider, // and can now be relayed as packet to consumer // consumer1 will now see the validator power changes - consumer2 will not (had not been relayed) - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -101,7 +101,7 @@ func stepsMultiConsumerDowntimeFromConsumer(consumer1, consumer2 string) []Step }, { // both consumer1 and consumer will now see the validator power changes - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer2), Port: "provider", @@ -125,7 +125,7 @@ func stepsMultiConsumerDowntimeFromConsumer(consumer1, consumer2 string) []Step }, }, { - Action: unjailValidatorAction{ + Action: UnjailValidatorAction{ Provider: ChainID("provi"), Validator: ValidatorID("bob"), }, @@ -158,7 +158,7 @@ func stepsMultiConsumerDowntimeFromConsumer(consumer1, consumer2 string) []Step }, { // relay to consumer 1 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -190,7 +190,7 @@ func stepsMultiConsumerDowntimeFromConsumer(consumer1, consumer2 string) []Step }, { // relay to consumer2 - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer2), Port: "provider", @@ -229,7 +229,7 @@ func stepsMultiConsumerDowntimeFromProvider(consumer1, consumer2 string) []Step return []Step{ // Now we test provider initiated downtime/slashing { - Action: downtimeSlashAction{ + Action: DowntimeSlashAction{ Chain: ChainID("provi"), Validator: ValidatorID("carol"), }, @@ -259,7 +259,7 @@ func stepsMultiConsumerDowntimeFromProvider(consumer1, consumer2 string) []Step }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -293,7 +293,7 @@ func stepsMultiConsumerDowntimeFromProvider(consumer1, consumer2 string) []Step }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer2), Port: "provider", @@ -326,7 +326,7 @@ func stepsMultiConsumerDowntimeFromProvider(consumer1, consumer2 string) []Step }, }, { - Action: unjailValidatorAction{ + Action: UnjailValidatorAction{ Provider: ChainID("provi"), Validator: ValidatorID("carol"), }, @@ -355,7 +355,7 @@ func stepsMultiConsumerDowntimeFromProvider(consumer1, consumer2 string) []Step }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer1), Port: "provider", @@ -387,7 +387,7 @@ func stepsMultiConsumerDowntimeFromProvider(consumer1, consumer2 string) []Step }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumer2), Port: "provider", diff --git a/tests/e2e/steps_reward_denom.go b/tests/e2e/steps_reward_denom.go index d5b524fbd9..657508cd1b 100644 --- a/tests/e2e/steps_reward_denom.go +++ b/tests/e2e/steps_reward_denom.go @@ -3,7 +3,7 @@ package main func stepsRewardDenomConsumer(consumerName string) []Step { return []Step{ { - Action: registerRepresentativeAction{ + Action: RegisterRepresentativeAction{ Chain: ChainID(consumerName), Representatives: []ValidatorID{ValidatorID("alice"), ValidatorID("bob")}, Stakes: []uint{100000000, 40000000}, @@ -27,7 +27,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, }, { - Action: delegateTokensAction{ + Action: DelegateTokensAction{ Chain: ChainID(consumerName), From: ValidatorID("carol"), To: ValidatorID("alice"), @@ -61,7 +61,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, { // whitelisted legacy proposal can only handle ibctransfer.SendEnabled/ReceiveEnabled - Action: submitParamChangeLegacyProposalAction{ + Action: SubmitParamChangeLegacyProposalAction{ Chain: ChainID(consumerName), From: ValidatorID("alice"), Deposit: 10000001, @@ -91,7 +91,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, { // Have accounts vote on something on the gov-consumer chain - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID(consumerName), From: []ValidatorID{ValidatorID("alice"), ValidatorID("bob")}, Vote: []string{"yes", "no"}, @@ -120,7 +120,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, }, { - Action: relayRewardPacketsToProviderAction{ + Action: RelayRewardPacketsToProviderAction{ ConsumerChain: ChainID(consumerName), ProviderChain: ChainID("provi"), Port: "transfer", @@ -144,7 +144,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, }, { - Action: submitChangeRewardDenomsProposalAction{ + Action: SubmitChangeRewardDenomsProposalAction{ Denom: "ibc/3C3D7B3BE4ECC85A0E5B52A3AEC3B7DFC2AA9CA47C37821E57020D6807043BE9", Deposit: 10000001, From: ValidatorID("bob"), @@ -157,7 +157,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, }, { - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID("provi"), From: []ValidatorID{ValidatorID("alice"), ValidatorID("bob"), ValidatorID("carol")}, Vote: []string{"yes", "yes", "yes"}, @@ -171,7 +171,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, }, { - Action: relayRewardPacketsToProviderAction{ + Action: RelayRewardPacketsToProviderAction{ ConsumerChain: ChainID(consumerName), ProviderChain: ChainID("provi"), Port: "transfer", @@ -193,7 +193,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, }, { - Action: downtimeSlashAction{ + Action: DowntimeSlashAction{ Chain: ChainID(consumerName), Validator: ValidatorID("bob"), }, @@ -216,7 +216,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -243,7 +243,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { // A block is incremented each Action, hence why VSC is committed on provider, // and can now be relayed as packet to consumer { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -261,7 +261,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, }, { - Action: unjailValidatorAction{ + Action: UnjailValidatorAction{ Provider: ChainID("provi"), Validator: ValidatorID("bob"), }, @@ -283,7 +283,7 @@ func stepsRewardDenomConsumer(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", diff --git a/tests/e2e/steps_sovereign_changeover.go b/tests/e2e/steps_sovereign_changeover.go index 8c053299cc..69e6680677 100644 --- a/tests/e2e/steps_sovereign_changeover.go +++ b/tests/e2e/steps_sovereign_changeover.go @@ -10,7 +10,7 @@ import clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" func stepsSovereignTransferChan() []Step { return []Step{ { - Action: createIbcClientsAction{ + Action: CreateIbcClientsAction{ ChainA: ChainID("sover"), ChainB: ChainID("provi"), }, @@ -18,7 +18,7 @@ func stepsSovereignTransferChan() []Step { }, { // this will create channel-0 connection end on both chain - Action: addIbcChannelAction{ + Action: AddIbcChannelAction{ ChainA: ChainID("sover"), ChainB: ChainID("provi"), ConnectionA: 0, @@ -36,7 +36,7 @@ func stepsSovereignTransferChan() []Step { func stepsChangeoverToConsumer(consumerName string) []Step { s := []Step{ { - Action: submitConsumerAdditionProposalAction{ + Action: SubmitConsumerAdditionProposalAction{ PreCCV: true, Chain: ChainID("provi"), From: ValidatorID("alice"), @@ -68,7 +68,7 @@ func stepsChangeoverToConsumer(consumerName string) []Step { }, }, { - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID("provi"), From: []ValidatorID{ValidatorID("alice"), ValidatorID("bob"), ValidatorID("carol")}, Vote: []string{"yes", "yes", "yes"}, @@ -122,7 +122,7 @@ func stepsChangeoverToConsumer(consumerName string) []Step { }, }, { - Action: addIbcConnectionAction{ + Action: AddIbcConnectionAction{ ChainA: ChainID(consumerName), ChainB: ChainID("provi"), ClientA: 1, @@ -131,7 +131,7 @@ func stepsChangeoverToConsumer(consumerName string) []Step { State: State{}, }, { - Action: addIbcChannelAction{ + Action: AddIbcChannelAction{ ChainA: ChainID(consumerName), ChainB: ChainID("provi"), ConnectionA: 1, @@ -169,7 +169,7 @@ func stepRunSovereignChain() []Step { }, }, { - Action: delegateTokensAction{ + Action: DelegateTokensAction{ Chain: ChainID("sover"), From: ValidatorID("alice"), To: ValidatorID("alice"), @@ -213,7 +213,7 @@ func stepsUpgradeChain() []Step { }, }, { - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID("sover"), From: []ValidatorID{ValidatorID("alice")}, Vote: []string{"yes"}, @@ -234,7 +234,7 @@ func stepsUpgradeChain() []Step { }, }, { - Action: waitUntilBlockAction{ + Action: WaitUntilBlockAction{ Chain: ChainID("sover"), Block: 110, }, @@ -265,7 +265,7 @@ func stepsPostChangeoverDelegate(consumerName string) []Step { }, }, { - Action: delegateTokensAction{ + Action: DelegateTokensAction{ Chain: ChainID("provi"), From: ValidatorID("alice"), To: ValidatorID("alice"), @@ -289,7 +289,7 @@ func stepsPostChangeoverDelegate(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", @@ -322,7 +322,7 @@ func stepsPostChangeoverDelegate(consumerName string) []Step { }, }, { - Action: unbondTokensAction{ + Action: UnbondTokensAction{ Chain: ChainID("provi"), UnbondFrom: ValidatorID("alice"), Sender: ValidatorID("alice"), @@ -347,7 +347,7 @@ func stepsPostChangeoverDelegate(consumerName string) []Step { }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", diff --git a/tests/e2e/steps_start_chains.go b/tests/e2e/steps_start_chains.go index 58a5f75162..b1fdb65df5 100644 --- a/tests/e2e/steps_start_chains.go +++ b/tests/e2e/steps_start_chains.go @@ -31,7 +31,7 @@ func stepStartProviderChain() []Step { func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint, setupTransferChans bool) []Step { s := []Step{ { - Action: submitConsumerAdditionProposalAction{ + Action: SubmitConsumerAdditionProposalAction{ Chain: ChainID("provi"), From: ValidatorID("alice"), Deposit: 10000001, @@ -61,7 +61,7 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint // add a consumer key before the chain starts // the key will be present in consumer genesis initial_val_set { - Action: assignConsumerPubKeyAction{ + Action: AssignConsumerPubKeyAction{ Chain: ChainID(consumerName), Validator: ValidatorID("carol"), ConsumerPubkey: `{"@type":"/cosmos.crypto.ed25519.PubKey","key":"Ui5Gf1+mtWUdH8u3xlmzdKID+F3PK0sfXZ73GZ6q6is="}`, @@ -83,7 +83,7 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint }, { // op should fail - key already assigned by the same validator - Action: assignConsumerPubKeyAction{ + Action: AssignConsumerPubKeyAction{ Chain: ChainID(consumerName), Validator: ValidatorID("carol"), ConsumerPubkey: `{"@type":"/cosmos.crypto.ed25519.PubKey","key":"Ui5Gf1+mtWUdH8u3xlmzdKID+F3PK0sfXZ73GZ6q6is="}`, @@ -95,7 +95,7 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint }, { // op should fail - key already assigned by another validator - Action: assignConsumerPubKeyAction{ + Action: AssignConsumerPubKeyAction{ Chain: ChainID(consumerName), Validator: ValidatorID("bob"), // same pub key as carol @@ -117,7 +117,7 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint }, }, { - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID("provi"), From: []ValidatorID{ValidatorID("alice"), ValidatorID("bob"), ValidatorID("carol")}, Vote: []string{"yes", "yes", "yes"}, @@ -142,7 +142,7 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint }, }, { - Action: startConsumerChainAction{ + Action: StartConsumerChainAction{ ConsumerChain: ChainID(consumerName), ProviderChain: ChainID("provi"), Validators: []StartChainValidator{ @@ -176,7 +176,7 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint }, }, { - Action: addIbcConnectionAction{ + Action: AddIbcConnectionAction{ ChainA: ChainID(consumerName), ChainB: ChainID("provi"), ClientA: 0, @@ -185,7 +185,7 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint State: State{}, }, { - Action: addIbcChannelAction{ + Action: AddIbcChannelAction{ ChainA: ChainID(consumerName), ChainB: ChainID("provi"), ConnectionA: 0, @@ -200,7 +200,7 @@ func stepsStartConsumerChain(consumerName string, proposalIndex, chainIndex uint // currently only used in democracy tests if setupTransferChans { s = append(s, Step{ - Action: transferChannelCompleteAction{ + Action: TransferChannelCompleteAction{ ChainA: ChainID(consumerName), ChainB: ChainID("provi"), ConnectionA: 0, @@ -230,7 +230,7 @@ func stepsStartChains(consumerNames []string, setupTransferChans bool) []Step { func stepsAssignConsumerKeyOnStartedChain(consumerName, validator string) []Step { return []Step{ { - Action: assignConsumerPubKeyAction{ + Action: AssignConsumerPubKeyAction{ Chain: ChainID(consumerName), Validator: ValidatorID("bob"), // reconfigure the node -> validator was using provider key @@ -268,7 +268,7 @@ func stepsAssignConsumerKeyOnStartedChain(consumerName, validator string) []Step }, }, { - Action: relayPacketsAction{ + Action: RelayPacketsAction{ ChainA: ChainID("provi"), ChainB: ChainID(consumerName), Port: "provider", diff --git a/tests/e2e/steps_stop_chain.go b/tests/e2e/steps_stop_chain.go index 0841086417..36c0788901 100644 --- a/tests/e2e/steps_stop_chain.go +++ b/tests/e2e/steps_stop_chain.go @@ -6,7 +6,7 @@ import "time" func stepsStartRelayer() []Step { return []Step{ { - Action: startRelayerAction{}, + Action: StartRelayerAction{}, State: State{}, }, } @@ -16,7 +16,7 @@ func stepsStartRelayer() []Step { func stepsStopChain(consumerName string, propNumber uint) []Step { s := []Step{ { - Action: submitConsumerRemovalProposalAction{ + Action: SubmitConsumerRemovalProposalAction{ Chain: ChainID("provi"), From: ValidatorID("bob"), Deposit: 10000001, @@ -41,7 +41,7 @@ func stepsStopChain(consumerName string, propNumber uint) []Step { }, }, { - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID("provi"), From: []ValidatorID{ValidatorID("alice"), ValidatorID("bob"), ValidatorID("carol")}, Vote: []string{"yes", "yes", "yes"}, @@ -74,7 +74,7 @@ func stepsStopChain(consumerName string, propNumber uint) []Step { func stepsConsumerRemovalPropNotPassing(consumerName string, propNumber uint) []Step { s := []Step{ { - Action: submitConsumerRemovalProposalAction{ + Action: SubmitConsumerRemovalProposalAction{ Chain: ChainID("provi"), From: ValidatorID("bob"), Deposit: 10000001, @@ -99,7 +99,7 @@ func stepsConsumerRemovalPropNotPassing(consumerName string, propNumber uint) [] }, }, { - Action: voteGovProposalAction{ + Action: VoteGovProposalAction{ Chain: ChainID("provi"), From: []ValidatorID{ValidatorID("alice"), ValidatorID("bob"), ValidatorID("carol")}, Vote: []string{"no", "no", "no"}, diff --git a/tests/e2e/trace_handlers_test.go b/tests/e2e/trace_handlers_test.go index 024daae450..4352c2a1b3 100644 --- a/tests/e2e/trace_handlers_test.go +++ b/tests/e2e/trace_handlers_test.go @@ -14,13 +14,13 @@ import ( // an isolated test case for a proposal submission var proposalSubmissionSteps = []Step{ - {submitTextProposalAction{Title: "Proposal 1", Description: "Description 1"}, State{}}, + {SubmitTextProposalAction{Title: "Proposal 1", Description: "Description 1"}, State{}}, } // an isolated test case for a state check involving a proposal var proposalInStateSteps = []Step{ { - Action: submitConsumerRemovalProposalAction{}, + Action: SubmitConsumerRemovalProposalAction{}, State: State{ ChainID("provi"): ChainState{ Proposals: &map[uint]Proposal{ diff --git a/tests/e2e/tracehandler_testdata/changeover.json b/tests/e2e/tracehandler_testdata/changeover.json index cafe8aa69e..11eca4300a 100644 --- a/tests/e2e/tracehandler_testdata/changeover.json +++ b/tests/e2e/tracehandler_testdata/changeover.json @@ -32,7 +32,7 @@ } }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "sover", "From": "alice", @@ -106,7 +106,7 @@ } }, { - "ActionType": "main.createIbcClientsAction", + "ActionType": "main.CreateIbcClientsAction", "Action": { "ChainA": "sover", "ChainB": "provi" @@ -114,7 +114,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "sover", "ChainB": "provi", @@ -164,7 +164,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "sover", "From": [ @@ -205,7 +205,7 @@ } }, { - "ActionType": "main.waitUntilBlockAction", + "ActionType": "main.WaitUntilBlockAction", "Action": { "Block": 110, "Chain": "sover" @@ -213,7 +213,7 @@ "State": {} }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": true, "Chain": "provi", @@ -260,7 +260,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -372,7 +372,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "sover", "ChainB": "provi", @@ -382,7 +382,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "sover", "ChainB": "provi", @@ -422,7 +422,7 @@ } }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "provi", "From": "alice", @@ -469,7 +469,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "sover", @@ -525,7 +525,7 @@ } }, { - "ActionType": "main.unbondTokensAction", + "ActionType": "main.UnbondTokensAction", "Action": { "Chain": "provi", "Sender": "alice", @@ -572,7 +572,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "sover", diff --git a/tests/e2e/tracehandler_testdata/consumer-double-sign.json b/tests/e2e/tracehandler_testdata/consumer-double-sign.json index d6d1fc7086..18b69b8320 100644 --- a/tests/e2e/tracehandler_testdata/consumer-double-sign.json +++ b/tests/e2e/tracehandler_testdata/consumer-double-sign.json @@ -45,7 +45,7 @@ } }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": false, "Chain": "provi", @@ -92,7 +92,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -123,7 +123,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -135,7 +135,7 @@ "State": {} }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "bob", @@ -167,7 +167,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -216,7 +216,7 @@ } }, { - "ActionType": "main.startConsumerChainAction", + "ActionType": "main.StartConsumerChainAction", "Action": { "ConsumerChain": "consu", "ProviderChain": "provi", @@ -279,7 +279,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -289,7 +289,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -302,7 +302,7 @@ "State": {} }, { - "ActionType": "main.doublesignSlashAction", + "ActionType": "main.DoublesignSlashAction", "Action": { "Validator": "bob", "Chain": "consu" @@ -351,7 +351,7 @@ } }, { - "ActionType": "main.startConsumerEvidenceDetectorAction", + "ActionType": "main.StartConsumerEvidenceDetectorAction", "Action": { "Chain": "consu" }, @@ -399,7 +399,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", diff --git a/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json b/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json index 028637934f..f810d8045d 100644 --- a/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json +++ b/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json @@ -39,7 +39,7 @@ } }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": false, "Chain": "provi", @@ -86,7 +86,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "alice", @@ -117,7 +117,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -164,7 +164,7 @@ } }, { - "ActionType": "main.startConsumerChainAction", + "ActionType": "main.StartConsumerChainAction", "Action": { "ConsumerChain": "consu", "ProviderChain": "provi", @@ -214,7 +214,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -224,7 +224,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -237,7 +237,7 @@ "State": {} }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "provi", "From": "alice", @@ -282,7 +282,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -310,7 +310,7 @@ } }, { - "ActionType": "main.forkConsumerChainAction", + "ActionType": "main.ForkConsumerChainAction", "Action": { "ConsumerChain": "consu", "ProviderChain": "provi", @@ -320,12 +320,12 @@ "State": {} }, { - "ActionType": "main.startRelayerAction", + "ActionType": "main.StartRelayerAction", "Action": {}, "State": {} }, { - "ActionType": "main.startConsumerEvidenceDetectorAction", + "ActionType": "main.StartConsumerEvidenceDetectorAction", "Action": { "Chain": "consu" }, @@ -370,7 +370,7 @@ } }, { - "ActionType": "main.updateLightClientAction", + "ActionType": "main.UpdateLightClientAction", "Action": { "Chain": "consu", "HostChain": "provi", diff --git a/tests/e2e/tracehandler_testdata/democracy.json b/tests/e2e/tracehandler_testdata/democracy.json index 3a9ab84a96..37e12e29ef 100644 --- a/tests/e2e/tracehandler_testdata/democracy.json +++ b/tests/e2e/tracehandler_testdata/democracy.json @@ -45,7 +45,7 @@ } }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": false, "Chain": "provi", @@ -92,7 +92,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "democ", "Validator": "carol", @@ -123,7 +123,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "democ", "Validator": "carol", @@ -135,7 +135,7 @@ "State": {} }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "democ", "Validator": "bob", @@ -167,7 +167,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -216,7 +216,7 @@ } }, { - "ActionType": "main.startConsumerChainAction", + "ActionType": "main.StartConsumerChainAction", "Action": { "ConsumerChain": "democ", "ProviderChain": "provi", @@ -279,7 +279,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "democ", "ChainB": "provi", @@ -289,7 +289,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "democ", "ChainB": "provi", @@ -302,7 +302,7 @@ "State": {} }, { - "ActionType": "main.transferChannelCompleteAction", + "ActionType": "main.TransferChannelCompleteAction", "Action": { "ChainA": "democ", "ChainB": "provi", @@ -316,7 +316,7 @@ "State": {} }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "provi", "From": "alice", @@ -391,7 +391,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "democ", @@ -448,7 +448,7 @@ } }, { - "ActionType": "main.registerRepresentativeAction", + "ActionType": "main.RegisterRepresentativeAction", "Action": { "Chain": "democ", "Representatives": [ @@ -489,7 +489,7 @@ } }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "democ", "From": "carol", @@ -529,7 +529,7 @@ } }, { - "ActionType": "main.submitParamChangeLegacyProposalAction", + "ActionType": "main.SubmitParamChangeLegacyProposalAction", "Action": { "Chain": "democ", "From": "alice", @@ -576,7 +576,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "democ", "From": [ @@ -627,7 +627,7 @@ } }, { - "ActionType": "main.relayRewardPacketsToProviderAction", + "ActionType": "main.RelayRewardPacketsToProviderAction", "Action": { "ConsumerChain": "democ", "ProviderChain": "provi", @@ -660,7 +660,7 @@ } }, { - "ActionType": "main.submitChangeRewardDenomsProposalAction", + "ActionType": "main.SubmitChangeRewardDenomsProposalAction", "Action": { "Denom": "ibc/3C3D7B3BE4ECC85A0E5B52A3AEC3B7DFC2AA9CA47C37821E57020D6807043BE9", "Deposit": 10000001, @@ -684,7 +684,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -719,7 +719,7 @@ } }, { - "ActionType": "main.relayRewardPacketsToProviderAction", + "ActionType": "main.RelayRewardPacketsToProviderAction", "Action": { "ConsumerChain": "democ", "ProviderChain": "provi", @@ -752,7 +752,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "democ", "Validator": "bob" @@ -797,7 +797,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "democ", @@ -844,7 +844,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "democ", @@ -873,7 +873,7 @@ } }, { - "ActionType": "main.unjailValidatorAction", + "ActionType": "main.UnjailValidatorAction", "Action": { "Provider": "provi", "Validator": "bob" @@ -918,7 +918,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "democ", diff --git a/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json b/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json index 74df5293b9..37429ec695 100644 --- a/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json +++ b/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json @@ -45,7 +45,7 @@ } }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": false, "Chain": "provi", @@ -92,7 +92,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "democ", "Validator": "carol", @@ -123,7 +123,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "democ", "Validator": "carol", @@ -135,7 +135,7 @@ "State": {} }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "democ", "Validator": "bob", @@ -167,7 +167,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -216,7 +216,7 @@ } }, { - "ActionType": "main.startConsumerChainAction", + "ActionType": "main.StartConsumerChainAction", "Action": { "ConsumerChain": "democ", "ProviderChain": "provi", @@ -279,7 +279,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "democ", "ChainB": "provi", @@ -289,7 +289,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "democ", "ChainB": "provi", @@ -302,7 +302,7 @@ "State": {} }, { - "ActionType": "main.transferChannelCompleteAction", + "ActionType": "main.TransferChannelCompleteAction", "Action": { "ChainA": "democ", "ChainB": "provi", @@ -316,7 +316,7 @@ "State": {} }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "provi", "From": "alice", @@ -391,7 +391,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "democ", @@ -448,7 +448,7 @@ } }, { - "ActionType": "main.registerRepresentativeAction", + "ActionType": "main.RegisterRepresentativeAction", "Action": { "Chain": "democ", "Representatives": [ @@ -489,7 +489,7 @@ } }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "democ", "From": "carol", @@ -529,7 +529,7 @@ } }, { - "ActionType": "main.submitParamChangeLegacyProposalAction", + "ActionType": "main.SubmitParamChangeLegacyProposalAction", "Action": { "Chain": "democ", "From": "alice", @@ -576,7 +576,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "democ", "From": [ @@ -627,7 +627,7 @@ } }, { - "ActionType": "main.relayRewardPacketsToProviderAction", + "ActionType": "main.RelayRewardPacketsToProviderAction", "Action": { "ConsumerChain": "democ", "ProviderChain": "provi", @@ -660,7 +660,7 @@ } }, { - "ActionType": "main.submitChangeRewardDenomsProposalAction", + "ActionType": "main.SubmitChangeRewardDenomsProposalAction", "Action": { "Denom": "ibc/3C3D7B3BE4ECC85A0E5B52A3AEC3B7DFC2AA9CA47C37821E57020D6807043BE9", "Deposit": 10000001, @@ -684,7 +684,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -719,7 +719,7 @@ } }, { - "ActionType": "main.relayRewardPacketsToProviderAction", + "ActionType": "main.RelayRewardPacketsToProviderAction", "Action": { "ConsumerChain": "democ", "ProviderChain": "provi", @@ -752,7 +752,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "democ", "Validator": "bob" @@ -797,7 +797,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "democ", @@ -844,7 +844,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "democ", @@ -873,7 +873,7 @@ } }, { - "ActionType": "main.unjailValidatorAction", + "ActionType": "main.UnjailValidatorAction", "Action": { "Provider": "provi", "Validator": "bob" @@ -918,7 +918,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "democ", diff --git a/tests/e2e/tracehandler_testdata/happyPath.json b/tests/e2e/tracehandler_testdata/happyPath.json index 7c26f5c274..be6de2c94e 100644 --- a/tests/e2e/tracehandler_testdata/happyPath.json +++ b/tests/e2e/tracehandler_testdata/happyPath.json @@ -45,7 +45,7 @@ } }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": false, "Chain": "provi", @@ -92,7 +92,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -123,7 +123,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -135,7 +135,7 @@ "State": {} }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "bob", @@ -167,7 +167,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -216,7 +216,7 @@ } }, { - "ActionType": "main.startConsumerChainAction", + "ActionType": "main.StartConsumerChainAction", "Action": { "ConsumerChain": "consu", "ProviderChain": "provi", @@ -279,7 +279,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -289,7 +289,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -302,7 +302,7 @@ "State": {} }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "provi", "From": "alice", @@ -377,7 +377,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -434,7 +434,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "bob", @@ -489,7 +489,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -542,7 +542,7 @@ } }, { - "ActionType": "main.unbondTokensAction", + "ActionType": "main.UnbondTokensAction", "Action": { "Chain": "provi", "Sender": "alice", @@ -589,7 +589,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -618,7 +618,7 @@ } }, { - "ActionType": "main.unbondTokensAction", + "ActionType": "main.UnbondTokensAction", "Action": { "Chain": "provi", "Sender": "alice", @@ -665,7 +665,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -694,7 +694,7 @@ } }, { - "ActionType": "main.cancelUnbondTokensAction", + "ActionType": "main.CancelUnbondTokensAction", "Action": { "Chain": "provi", "Delegator": "alice", @@ -741,7 +741,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -770,7 +770,7 @@ } }, { - "ActionType": "main.redelegateTokensAction", + "ActionType": "main.RedelegateTokensAction", "Action": { "Chain": "provi", "Src": "alice", @@ -818,7 +818,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -847,7 +847,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "consu", "Validator": "alice" @@ -892,7 +892,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -939,7 +939,7 @@ } }, { - "ActionType": "main.redelegateTokensAction", + "ActionType": "main.RedelegateTokensAction", "Action": { "Chain": "provi", "Src": "carol", @@ -987,7 +987,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1016,7 +1016,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "consu", "Validator": "bob" @@ -1061,7 +1061,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1107,7 +1107,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1136,7 +1136,7 @@ } }, { - "ActionType": "main.unjailValidatorAction", + "ActionType": "main.UnjailValidatorAction", "Action": { "Provider": "provi", "Validator": "bob" @@ -1181,7 +1181,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1210,7 +1210,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "provi", "Validator": "carol" @@ -1255,7 +1255,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1284,7 +1284,7 @@ } }, { - "ActionType": "main.unjailValidatorAction", + "ActionType": "main.UnjailValidatorAction", "Action": { "Provider": "provi", "Validator": "carol" @@ -1329,7 +1329,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1358,7 +1358,7 @@ } }, { - "ActionType": "main.doublesignSlashAction", + "ActionType": "main.DoublesignSlashAction", "Action": { "Validator": "carol", "Chain": "provi" @@ -1403,7 +1403,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1450,12 +1450,12 @@ } }, { - "ActionType": "main.startRelayerAction", + "ActionType": "main.StartRelayerAction", "Action": {}, "State": {} }, { - "ActionType": "main.submitConsumerRemovalProposalAction", + "ActionType": "main.SubmitConsumerRemovalProposalAction", "Action": { "Chain": "provi", "From": "bob", @@ -1495,7 +1495,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -1542,7 +1542,7 @@ } }, { - "ActionType": "main.submitConsumerRemovalProposalAction", + "ActionType": "main.SubmitConsumerRemovalProposalAction", "Action": { "Chain": "provi", "From": "bob", @@ -1582,7 +1582,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ diff --git a/tests/e2e/tracehandler_testdata/multipleConsumers.json b/tests/e2e/tracehandler_testdata/multipleConsumers.json index a6b31d15e8..b8c2a95435 100644 --- a/tests/e2e/tracehandler_testdata/multipleConsumers.json +++ b/tests/e2e/tracehandler_testdata/multipleConsumers.json @@ -45,7 +45,7 @@ } }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": false, "Chain": "provi", @@ -92,7 +92,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -123,7 +123,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -135,7 +135,7 @@ "State": {} }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "bob", @@ -167,7 +167,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -216,7 +216,7 @@ } }, { - "ActionType": "main.startConsumerChainAction", + "ActionType": "main.StartConsumerChainAction", "Action": { "ConsumerChain": "consu", "ProviderChain": "provi", @@ -279,7 +279,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -289,7 +289,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -302,7 +302,7 @@ "State": {} }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": false, "Chain": "provi", @@ -349,7 +349,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "densu", "Validator": "carol", @@ -380,7 +380,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "densu", "Validator": "carol", @@ -392,7 +392,7 @@ "State": {} }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "densu", "Validator": "bob", @@ -424,7 +424,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -473,7 +473,7 @@ } }, { - "ActionType": "main.startConsumerChainAction", + "ActionType": "main.StartConsumerChainAction", "Action": { "ConsumerChain": "densu", "ProviderChain": "provi", @@ -536,7 +536,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "densu", "ChainB": "provi", @@ -546,7 +546,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "densu", "ChainB": "provi", @@ -559,7 +559,7 @@ "State": {} }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "provi", "From": "alice", @@ -624,7 +624,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -689,7 +689,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "densu", @@ -754,7 +754,7 @@ } }, { - "ActionType": "main.unbondTokensAction", + "ActionType": "main.UnbondTokensAction", "Action": { "Chain": "provi", "Sender": "alice", @@ -819,7 +819,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -884,7 +884,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "densu", @@ -949,7 +949,7 @@ } }, { - "ActionType": "main.redelegateTokensAction", + "ActionType": "main.RedelegateTokensAction", "Action": { "Chain": "provi", "Src": "alice", @@ -1015,7 +1015,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1080,7 +1080,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "densu", @@ -1145,7 +1145,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "consu", "Validator": "bob" @@ -1208,7 +1208,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1273,7 +1273,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1320,7 +1320,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "densu", @@ -1367,7 +1367,7 @@ } }, { - "ActionType": "main.unjailValidatorAction", + "ActionType": "main.UnjailValidatorAction", "Action": { "Provider": "provi", "Validator": "bob" @@ -1430,7 +1430,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1495,7 +1495,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "densu", @@ -1560,7 +1560,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "provi", "Validator": "carol" @@ -1623,7 +1623,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1688,7 +1688,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "densu", @@ -1753,7 +1753,7 @@ } }, { - "ActionType": "main.unjailValidatorAction", + "ActionType": "main.UnjailValidatorAction", "Action": { "Provider": "provi", "Validator": "carol" @@ -1816,7 +1816,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1881,7 +1881,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "densu", @@ -1946,7 +1946,7 @@ } }, { - "ActionType": "main.doublesignSlashAction", + "ActionType": "main.DoublesignSlashAction", "Action": { "Validator": "carol", "Chain": "provi" @@ -2009,7 +2009,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -2074,7 +2074,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "densu", @@ -2139,7 +2139,7 @@ } }, { - "ActionType": "main.doublesignSlashAction", + "ActionType": "main.DoublesignSlashAction", "Action": { "Validator": "bob", "Chain": "consu" @@ -2202,7 +2202,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -2267,7 +2267,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -2332,7 +2332,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "densu", diff --git a/tests/e2e/tracehandler_testdata/shorthappy.json b/tests/e2e/tracehandler_testdata/shorthappy.json index 85e96aeed1..67e333d5b2 100644 --- a/tests/e2e/tracehandler_testdata/shorthappy.json +++ b/tests/e2e/tracehandler_testdata/shorthappy.json @@ -45,7 +45,7 @@ } }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": false, "Chain": "provi", @@ -92,7 +92,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -123,7 +123,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -135,7 +135,7 @@ "State": {} }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "bob", @@ -167,7 +167,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -216,7 +216,7 @@ } }, { - "ActionType": "main.startConsumerChainAction", + "ActionType": "main.StartConsumerChainAction", "Action": { "ConsumerChain": "consu", "ProviderChain": "provi", @@ -279,7 +279,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -289,7 +289,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -302,7 +302,7 @@ "State": {} }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "provi", "From": "alice", @@ -377,7 +377,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -434,7 +434,7 @@ } }, { - "ActionType": "main.unbondTokensAction", + "ActionType": "main.UnbondTokensAction", "Action": { "Chain": "provi", "Sender": "alice", @@ -481,7 +481,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -510,7 +510,7 @@ } }, { - "ActionType": "main.redelegateTokensAction", + "ActionType": "main.RedelegateTokensAction", "Action": { "Chain": "provi", "Src": "alice", @@ -558,7 +558,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -587,7 +587,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "consu", "Validator": "bob" @@ -632,7 +632,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -678,7 +678,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -707,7 +707,7 @@ } }, { - "ActionType": "main.unjailValidatorAction", + "ActionType": "main.UnjailValidatorAction", "Action": { "Provider": "provi", "Validator": "bob" @@ -752,7 +752,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -781,7 +781,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "provi", "Validator": "carol" @@ -826,7 +826,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -855,7 +855,7 @@ } }, { - "ActionType": "main.unjailValidatorAction", + "ActionType": "main.UnjailValidatorAction", "Action": { "Provider": "provi", "Validator": "carol" @@ -900,7 +900,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -929,7 +929,7 @@ } }, { - "ActionType": "main.doublesignSlashAction", + "ActionType": "main.DoublesignSlashAction", "Action": { "Validator": "carol", "Chain": "provi" @@ -974,7 +974,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -1021,12 +1021,12 @@ } }, { - "ActionType": "main.startRelayerAction", + "ActionType": "main.StartRelayerAction", "Action": {}, "State": {} }, { - "ActionType": "main.submitConsumerRemovalProposalAction", + "ActionType": "main.SubmitConsumerRemovalProposalAction", "Action": { "Chain": "provi", "From": "bob", @@ -1066,7 +1066,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -1113,7 +1113,7 @@ } }, { - "ActionType": "main.submitConsumerRemovalProposalAction", + "ActionType": "main.SubmitConsumerRemovalProposalAction", "Action": { "Chain": "provi", "From": "bob", @@ -1153,7 +1153,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ diff --git a/tests/e2e/tracehandler_testdata/slashThrottle.json b/tests/e2e/tracehandler_testdata/slashThrottle.json index dbca351d49..90c595e1f0 100644 --- a/tests/e2e/tracehandler_testdata/slashThrottle.json +++ b/tests/e2e/tracehandler_testdata/slashThrottle.json @@ -45,7 +45,7 @@ } }, { - "ActionType": "main.submitConsumerAdditionProposalAction", + "ActionType": "main.SubmitConsumerAdditionProposalAction", "Action": { "PreCCV": false, "Chain": "provi", @@ -92,7 +92,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -123,7 +123,7 @@ } }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "carol", @@ -135,7 +135,7 @@ "State": {} }, { - "ActionType": "main.assignConsumerPubKeyAction", + "ActionType": "main.AssignConsumerPubKeyAction", "Action": { "Chain": "consu", "Validator": "bob", @@ -167,7 +167,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [ @@ -216,7 +216,7 @@ } }, { - "ActionType": "main.startConsumerChainAction", + "ActionType": "main.StartConsumerChainAction", "Action": { "ConsumerChain": "consu", "ProviderChain": "provi", @@ -279,7 +279,7 @@ } }, { - "ActionType": "main.addIbcConnectionAction", + "ActionType": "main.AddIbcConnectionAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -289,7 +289,7 @@ "State": {} }, { - "ActionType": "main.addIbcChannelAction", + "ActionType": "main.AddIbcChannelAction", "Action": { "ChainA": "consu", "ChainB": "provi", @@ -302,7 +302,7 @@ "State": {} }, { - "ActionType": "main.delegateTokensAction", + "ActionType": "main.DelegateTokensAction", "Action": { "Chain": "provi", "From": "alice", @@ -377,7 +377,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -434,7 +434,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "consu", "Validator": "bob" @@ -479,7 +479,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -526,7 +526,7 @@ } }, { - "ActionType": "main.downtimeSlashAction", + "ActionType": "main.DowntimeSlashAction", "Action": { "Chain": "consu", "Validator": "carol" @@ -571,7 +571,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -618,7 +618,7 @@ } }, { - "ActionType": "main.slashMeterReplenishmentAction", + "ActionType": "main.SlashMeterReplenishmentAction", "Action": { "TargetValue": 0, "Timeout": 100000000000 @@ -663,7 +663,7 @@ } }, { - "ActionType": "main.waitTimeAction", + "ActionType": "main.WaitTimeAction", "Action": { "WaitTime": 30000000000 }, @@ -703,7 +703,7 @@ } }, { - "ActionType": "main.relayPacketsAction", + "ActionType": "main.RelayPacketsAction", "Action": { "ChainA": "provi", "ChainB": "consu", @@ -746,7 +746,7 @@ } }, { - "ActionType": "main.submitConsumerRemovalProposalAction", + "ActionType": "main.SubmitConsumerRemovalProposalAction", "Action": { "Chain": "provi", "From": "bob", @@ -786,7 +786,7 @@ } }, { - "ActionType": "main.voteGovProposalAction", + "ActionType": "main.VoteGovProposalAction", "Action": { "Chain": "provi", "From": [