refactor nextBlocks(epoch) to nextEpoch

cosmos · Mar 1, 2024 · 914840c · 914840c
1 parent 2208cd4
commit 914840c
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 40 deletions.
diff --git a/tests/integration/common.go b/tests/integration/common.go
@@ -127,7 +127,7 @@ func delegateAndRedelegate(s *CCVTestSuite, delAddr sdk.AccAddress,
 	srcValTokensAfter := s.getVal(s.providerCtx(), srcValAddr).GetBondedTokens()
 	s.Require().Equal(srcValTokensAfter.Sub(srcValTokensBefore), amount)
 
-	nextBlocks(s.providerChain, s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch)
+	s.nextEpoch()
 
 	dstValTokensBefore := s.getVal(s.providerCtx(), dstValAddr).GetBondedTokens()
 
@@ -626,9 +626,11 @@ func (s *CCVTestSuite) mustGetStakingValFromTmVal(tmVal tmtypes.Validator) (stak
 	return stakingVal
 }
 
-// nextBlocks moves `chain` forward by a `numberOfBlocks` blocks
-func nextBlocks(chain *ibctesting.TestChain, numberOfBlocks int64) {
-	for i := int64(0); i < numberOfBlocks; i++ {
-		chain.NextBlock()
+// nextEpoch moves `chain` forward by an epoch
+func (s *CCVTestSuite) nextEpoch() {
+	blocksPerEpoch := s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch
+
+	for i := int64(0); i < blocksPerEpoch; i++ {
+		s.providerChain.NextBlock()
 	}
 }
diff --git a/tests/integration/distribution.go b/tests/integration/distribution.go
@@ -23,7 +23,7 @@ func (s *CCVTestSuite) TestRewardsDistribution() {
 	bondAmt := sdk.NewInt(10000000)
 	delAddr := s.providerChain.SenderAccount.GetAddress()
 	delegate(s, delAddr, bondAmt)
-	nextBlocks(s.providerChain, s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch)
+	s.nextEpoch()
 
 	// register a consumer reward denom
 	params := s.consumerApp.GetConsumerKeeper().GetConsumerParams(s.consumerCtx())
@@ -124,7 +124,7 @@ func (s *CCVTestSuite) TestSendRewardsRetries() {
 	bondAmt := sdk.NewInt(10000000)
 	delAddr := s.providerChain.SenderAccount.GetAddress()
 	delegate(s, delAddr, bondAmt)
-	nextBlocks(s.providerChain, s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch)
+	s.nextEpoch()
 
 	// Register denom on consumer chain
 	params := s.consumerApp.GetConsumerKeeper().GetConsumerParams(s.consumerCtx())
@@ -253,7 +253,7 @@ func (s *CCVTestSuite) TestEndBlockRD() {
 		bondAmt := sdk.NewInt(10000000)
 		delAddr := s.providerChain.SenderAccount.GetAddress()
 		delegate(s, delAddr, bondAmt)
-		nextBlocks(s.providerChain, s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch)
+		s.nextEpoch()
 
 		if tc.denomRegistered {
 			params := s.consumerApp.GetConsumerKeeper().GetConsumerParams(s.consumerCtx())

diff --git a/tests/integration/expired_client.go b/tests/integration/expired_client.go
@@ -33,16 +33,15 @@ func (s *CCVTestSuite) TestVSCPacketSendExpiredClient() {
 	delegate(s, delAddr, bondAmt)
 
 	// try to send CCV packet to consumer
-	blocksPerEpoch := s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch
-	nextBlocks(s.providerChain, blocksPerEpoch)
+	s.nextEpoch()
 
 	// check that the packet was added to the list of pending VSC packets
 	packets := providerKeeper.GetPendingVSCPackets(s.providerCtx(), s.consumerChain.ChainID)
 	s.Require().NotEmpty(packets, "no pending VSC packets found")
 	s.Require().Equal(1, len(packets), "unexpected number of pending VSC packets")
 
 	// try again to send CCV packet to consumer
-	nextBlocks(s.providerChain, blocksPerEpoch)
+	s.nextEpoch()
 
 	// check that the packet is still in the list of pending VSC packets
 	packets = providerKeeper.GetPendingVSCPackets(s.providerCtx(), s.consumerChain.ChainID)
@@ -53,7 +52,7 @@ func (s *CCVTestSuite) TestVSCPacketSendExpiredClient() {
 	delegate(s, delAddr, bondAmt)
 
 	// try again to send CCV packets to consumer
-	nextBlocks(s.providerChain, blocksPerEpoch)
+	s.nextEpoch()
 
 	// check that the packets are still in the list of pending VSC packets
 	packets = providerKeeper.GetPendingVSCPackets(s.providerCtx(), s.consumerChain.ChainID)
@@ -64,7 +63,7 @@ func (s *CCVTestSuite) TestVSCPacketSendExpiredClient() {
 	upgradeExpiredClient(s, Consumer)
 
 	// go to next epoch
-	nextBlocks(s.providerChain, blocksPerEpoch)
+	s.nextEpoch()
 
 	// check that the packets are not in the list of pending VSC packets
 	packets = providerKeeper.GetPendingVSCPackets(s.providerCtx(), s.consumerChain.ChainID)
@@ -74,7 +73,7 @@ func (s *CCVTestSuite) TestVSCPacketSendExpiredClient() {
 	// - bond more tokens on provider to change validator powers
 	delegate(s, delAddr, bondAmt)
 	// - send CCV packet to consumer
-	nextBlocks(s.providerChain, blocksPerEpoch)
+	s.nextEpoch()
 	// - relay all VSC packet from provider to consumer
 	relayAllCommittedPackets(s, s.providerChain, s.path, ccv.ProviderPortID, s.path.EndpointB.ChannelID, 3)
 	// - increment time so that the unbonding period ends on the consumer
@@ -103,8 +102,7 @@ func (s *CCVTestSuite) TestConsumerPacketSendExpiredClient() {
 	delegate(s, delAddr, bondAmt)
 
 	// send CCV packets to consumer
-	blocksPerEpoch := s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch
-	nextBlocks(s.providerChain, blocksPerEpoch)
+	s.nextEpoch()
 
 	// check that the packets are not in the list of pending VSC packets
 	providerPackets := providerKeeper.GetPendingVSCPackets(s.providerCtx(), s.consumerChain.ChainID)
@@ -174,7 +172,7 @@ func (s *CCVTestSuite) TestConsumerPacketSendExpiredClient() {
 	// - bond more tokens on provider to change validator powers
 	delegate(s, delAddr, bondAmt)
 	// - send CCV packet to consumer
-	nextBlocks(s.providerChain, blocksPerEpoch)
+	s.nextEpoch()
 	// - relay 1 VSC packet from provider to consumer
 	relayAllCommittedPackets(s, s.providerChain, s.path, ccv.ProviderPortID, s.path.EndpointB.ChannelID, 1)
 	// - increment time so that the unbonding period ends on the provider

diff --git a/tests/integration/key_assignment.go b/tests/integration/key_assignment.go
@@ -14,7 +14,6 @@ import (
 )
 
 func (s *CCVTestSuite) TestKeyAssignment() {
-	blocksPerEpoch := s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch
 	testCases := []struct {
 		name           string
 		assignFunc     func(*providerkeeper.Keeper) error
@@ -31,7 +30,7 @@ func (s *CCVTestSuite) TestKeyAssignment() {
 				}
 
 				// check that a VSCPacket is queued
-				nextBlocks(s.providerChain, blocksPerEpoch)
+				s.nextEpoch()
 				pendingPackets := pk.GetPendingVSCPackets(s.providerCtx(), s.consumerChain.ChainID)
 				s.Require().Len(pendingPackets, 1)
 
@@ -52,7 +51,7 @@ func (s *CCVTestSuite) TestKeyAssignment() {
 				if err != nil {
 					return err
 				}
-				nextBlocks(s.providerChain, blocksPerEpoch)
+				s.nextEpoch()
 
 				return nil
 			}, false, 2,
@@ -74,7 +73,7 @@ func (s *CCVTestSuite) TestKeyAssignment() {
 				delAddr := s.providerChain.SenderAccount.GetAddress()
 				delegate(s, delAddr, bondAmt)
 
-				nextBlocks(s.providerChain, blocksPerEpoch)
+				s.nextEpoch()
 
 				return nil
 			}, false, 2,
@@ -96,7 +95,7 @@ func (s *CCVTestSuite) TestKeyAssignment() {
 				if err != nil {
 					return err
 				}
-				nextBlocks(s.providerChain, blocksPerEpoch)
+				s.nextEpoch()
 
 				return nil
 			}, true, 2,
@@ -119,7 +118,7 @@ func (s *CCVTestSuite) TestKeyAssignment() {
 				if err != nil {
 					return err
 				}
-				nextBlocks(s.providerChain, blocksPerEpoch)
+				s.nextEpoch()
 
 				return nil
 			}, false, 2,
@@ -135,14 +134,14 @@ func (s *CCVTestSuite) TestKeyAssignment() {
 				if err != nil {
 					return err
 				}
-				nextBlocks(s.providerChain, blocksPerEpoch)
+				s.nextEpoch()
 
 				// same key assignment
 				err = pk.AssignConsumerKey(s.providerCtx(), s.consumerChain.ChainID, validator, consumerKey)
 				if err != nil {
 					return err
 				}
-				nextBlocks(s.providerChain, blocksPerEpoch)
+				s.nextEpoch()
 
 				return nil
 			}, true, 2,
@@ -158,15 +157,15 @@ func (s *CCVTestSuite) TestKeyAssignment() {
 				if err != nil {
 					return err
 				}
-				nextBlocks(s.providerChain, blocksPerEpoch)
+				s.nextEpoch()
 
 				// same key assignment
 				validator, consumerKey = generateNewConsumerKey(s, 0)
 				err = pk.AssignConsumerKey(s.providerCtx(), s.consumerChain.ChainID, validator, consumerKey)
 				if err != nil {
 					return err
 				}
-				nextBlocks(s.providerChain, blocksPerEpoch)
+				s.nextEpoch()
 
 				return nil
 			}, false, 3,

diff --git a/tests/integration/slashing.go b/tests/integration/slashing.go
@@ -107,7 +107,7 @@ func (s *CCVTestSuite) TestRelayAndApplyDowntimePacket() {
 		s.Require().True(found)
 	}
 
-	nextBlocks(s.providerChain, s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch)
+	s.nextEpoch()
 
 	// Confirm the valset update Id was incremented twice on provider,
 	// since an epoch has passed.

diff --git a/tests/integration/soft_opt_out.go b/tests/integration/soft_opt_out.go
@@ -20,8 +20,6 @@ import (
 func (suite *CCVTestSuite) TestSoftOptOut() {
 	var votes []abci.VoteInfo
 
-	blocksPerEpoch := suite.providerApp.GetProviderKeeper().GetParams(suite.providerCtx()).BlocksPerEpoch
-
 	testCases := []struct {
 		name            string
 		downtimeFunc    func(*consumerKeeper.Keeper, *slashingkeeper.Keeper, []byte, int)
@@ -75,7 +73,7 @@ func (suite *CCVTestSuite) TestSoftOptOut() {
 				bondAmt := sdk.NewInt(100).Mul(sdk.DefaultPowerReduction)
 				delegateByIdx(suite, delAddr, bondAmt, valIdx)
 
-				nextBlocks(suite.providerChain, blocksPerEpoch)
+				suite.nextEpoch()
 
 				// Relay 1 VSC packet from provider to consumer
 				relayAllCommittedPackets(suite, suite.providerChain, suite.path, ccv.ProviderPortID, suite.path.EndpointB.ChannelID, 1)
@@ -114,7 +112,7 @@ func (suite *CCVTestSuite) TestSoftOptOut() {
 				bondAmt := sdk.NewInt(100).Mul(sdk.DefaultPowerReduction)
 				delegateByIdx(suite, delAddr, bondAmt, valIdx)
 
-				nextBlocks(suite.providerChain, blocksPerEpoch)
+				suite.nextEpoch()
 
 				// Relay 1 VSC packet from provider to consumer
 				relayAllCommittedPackets(suite, suite.providerChain, suite.path, ccv.ProviderPortID, suite.path.EndpointB.ChannelID, 1)
@@ -151,7 +149,7 @@ func (suite *CCVTestSuite) TestSoftOptOut() {
 		validatorPowers := []int64{1000, 500, 50, 10}
 		suite.setupValidatorPowers(validatorPowers)
 
-		nextBlocks(suite.providerChain, blocksPerEpoch)
+		suite.nextEpoch()
 
 		// Relay 1 VSC packet from provider to consumer
 		relayAllCommittedPackets(suite, suite.providerChain, suite.path, ccv.ProviderPortID, suite.path.EndpointB.ChannelID, 1)

diff --git a/tests/integration/unbonding.go b/tests/integration/unbonding.go
@@ -231,8 +231,7 @@ func (s *CCVTestSuite) TestUndelegationDuringInit() {
 		// update init timeout timestamp
 		tc.updateInitTimeoutTimestamp(&providerKeeper, providerUnbondingPeriod)
 
-		blocksPerEpoch := s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch
-		nextBlocks(s.providerChain, blocksPerEpoch)
+		s.nextEpoch()
 
 		// check that the VSC packet is stored in state as pending
 		pendingVSCs := providerKeeper.GetPendingVSCPackets(s.providerCtx(), s.consumerChain.ChainID)
@@ -241,8 +240,7 @@ func (s *CCVTestSuite) TestUndelegationDuringInit() {
 		// delegate again to create another VSC packet
 		delegate(s, delAddr, bondAmt)
 
-		// call NextBlocks on the provider (which increments the height)
-		nextBlocks(s.providerChain, blocksPerEpoch)
+		s.nextEpoch()
 
 		// check that the VSC packet is stored in state as pending
 		pendingVSCs = providerKeeper.GetPendingVSCPackets(s.providerCtx(), s.consumerChain.ChainID)
@@ -266,7 +264,7 @@ func (s *CCVTestSuite) TestUndelegationDuringInit() {
 
 			// complete CCV channel setup
 			s.SetupCCVChannel(s.path)
-			nextBlocks(s.providerChain, blocksPerEpoch)
+			s.nextEpoch()
 
 			// relay VSC packets from provider to consumer
 			relayAllCommittedPackets(s, s.providerChain, s.path, ccv.ProviderPortID, s.path.EndpointB.ChannelID, 2)
@@ -431,7 +429,7 @@ func (s *CCVTestSuite) TestRedelegationProviderFirst() {
 	checkCCVUnbondingOp(s, s.providerCtx(), s.consumerChain.ChainID, valsetUpdateID, true)
 
 	// move forward by an epoch to be able to relay VSC packets
-	nextBlocks(s.providerChain, s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch)
+	s.nextEpoch()
 
 	// Relay 2 VSC packets from provider to consumer (original delegation, and redelegation)
 	relayAllCommittedPackets(s, s.providerChain, s.path,

diff --git a/tests/integration/valset_update.go b/tests/integration/valset_update.go
@@ -24,7 +24,7 @@ func (s *CCVTestSuite) TestPacketRoundtrip() {
 	delegate(s, delAddr, bondAmt)
 
 	// Send CCV packet to consumer at the end of the epoch
-	nextBlocks(s.providerChain, s.providerApp.GetProviderKeeper().GetParams(s.providerCtx()).BlocksPerEpoch)
+	s.nextEpoch()
 
 	// Relay 1 VSC packet from provider to consumer
 	relayAllCommittedPackets(s, s.providerChain, s.path, ccv.ProviderPortID, s.path.EndpointB.ChannelID, 1)