From cc67a8cbd8ed5049fc6efe59552a334a59d16082 Mon Sep 17 00:00:00 2001 From: Simon Noetzlin Date: Wed, 20 Sep 2023 09:43:12 +0200 Subject: [PATCH] reformat --- tests/e2e/e2e_exec_test.go | 8 +++----- tests/e2e/e2e_staking_test.go | 4 ++-- tests/e2e/e2e_vesting_test.go | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/e2e/e2e_exec_test.go b/tests/e2e/e2e_exec_test.go index 4a599dedf38..32936c6ad2e 100644 --- a/tests/e2e/e2e_exec_test.go +++ b/tests/e2e/e2e_exec_test.go @@ -466,8 +466,7 @@ func (s *IntegrationTestSuite) runGovExec(c *chain, valIdx int, submitterAddr, g // }) // } -// TODO rename to execDelegate for consistency -func (s *IntegrationTestSuite) executeDelegate(c *chain, valIdx int, amount, valOperAddress, delegatorAddr, home, delegateFees string) { //nolint:unparam +func (s *IntegrationTestSuite) execDelegate(c *chain, valIdx int, amount, valOperAddress, delegatorAddr, home, delegateFees string) { //nolint:unparam ctx, cancel := context.WithTimeout(context.Background(), time.Minute) defer cancel() @@ -545,11 +544,10 @@ func (s *IntegrationTestSuite) execCancelUnbondingDelegation(c *chain, valIdx in } s.executeGaiaTxCommand(ctx, c, gaiaCommand, valIdx, s.defaultExecValidation(c, valIdx)) - s.T().Logf("%s successfully undelegated %s to %s", delegatorAddr, amount, valOperAddress) + s.T().Logf("%s successfully canceled unbonding %s to %s", delegatorAddr, amount, valOperAddress) } -// TODO rename to execRedelegate for consistency -func (s *IntegrationTestSuite) executeRedelegate(c *chain, valIdx int, amount, originalValOperAddress, +func (s *IntegrationTestSuite) execRedelegate(c *chain, valIdx int, amount, originalValOperAddress, newValOperAddress, delegatorAddr, home, delegateFees string, ) { ctx, cancel := context.WithTimeout(context.Background(), time.Minute) diff --git a/tests/e2e/e2e_staking_test.go b/tests/e2e/e2e_staking_test.go index aef20268d7f..66019b4d116 100644 --- a/tests/e2e/e2e_staking_test.go +++ b/tests/e2e/e2e_staking_test.go @@ -29,7 +29,7 @@ func (s *IntegrationTestSuite) testStaking() { delegation := sdk.NewCoin(uatomDenom, delegationAmount) // 500 atom // Alice delegate uatom to Validator A - s.executeDelegate(s.chainA, 0, delegation.String(), validatorAddressA, delegatorAddress.String(), gaiaHomePath, fees.String()) + s.execDelegate(s.chainA, 0, delegation.String(), validatorAddressA, delegatorAddress.String(), gaiaHomePath, fees.String()) // Validate delegation successful s.Require().Eventually( @@ -48,7 +48,7 @@ func (s *IntegrationTestSuite) testStaking() { redelegation := sdk.NewCoin(uatomDenom, redelegationAmount) // 250 atom // Alice re-delegate half of her uatom delegation from Validator A to Validator B - s.executeRedelegate(s.chainA, 0, redelegation.String(), validatorAddressA, validatorAddressB, delegatorAddress.String(), gaiaHomePath, fees.String()) + s.execRedelegate(s.chainA, 0, redelegation.String(), validatorAddressA, validatorAddressB, delegatorAddress.String(), gaiaHomePath, fees.String()) // Validate re-delegation successful s.Require().Eventually( diff --git a/tests/e2e/e2e_vesting_test.go b/tests/e2e/e2e_vesting_test.go index 0483cb8343c..6d652a1d8b3 100644 --- a/tests/e2e/e2e_vesting_test.go +++ b/tests/e2e/e2e_vesting_test.go @@ -59,7 +59,7 @@ func (s *IntegrationTestSuite) testDelayedVestingAccount(api string) { s.Require().Equal(vestingBalance.AmountOf(uatomDenom), balance.Amount) // Delegate coins should succeed - s.executeDelegate(chain, valIdx, vestingDelegationAmount.String(), valOpAddr, + s.execDelegate(chain, valIdx, vestingDelegationAmount.String(), valOpAddr, vestingDelayedAcc.String(), gaiaHomePath, vestingDelegationFees.String()) // Validate delegation successful @@ -128,7 +128,7 @@ func (s *IntegrationTestSuite) testContinuousVestingAccount(api string) { s.Require().Equal(vestingBalance.AmountOf(uatomDenom), balance.Amount) // Delegate coins should succeed - s.executeDelegate(chain, valIdx, vestingDelegationAmount.String(), + s.execDelegate(chain, valIdx, vestingDelegationAmount.String(), valOpAddr, continuousVestingAcc.String(), gaiaHomePath, vestingDelegationFees.String()) // Validate delegation successful @@ -267,7 +267,7 @@ func (s *IntegrationTestSuite) testPeriodicVestingAccount(api string) { //nolint } // Delegate coins should succeed - s.executeDelegate(chain, valIdx, vestingDelegationAmount.String(), valOpAddr, + s.execDelegate(chain, valIdx, vestingDelegationAmount.String(), valOpAddr, periodicVestingAddr, gaiaHomePath, vestingDelegationFees.String()) // Validate delegation successful