Multi-consumer capable e2e tests

go.mod

@@ -136,7 +136,7 @@ require (
 
 replace (
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
-	github.com/cosmos/ibc-go/v3 => github.com/informalsystems/ibc-go/v3 v3.0.0-beta1.0.20221116144303-1e70792920f6
+	github.com/cosmos/ibc-go/v3 => github.com/informalsystems/ibc-go/v3 v3.0.0-beta1.0.20221121181828-c75c185d20b2
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/stretchr/testify => github.com/stretchr/testify v1.7.1
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2

go.sum

@@ -602,8 +602,8 @@ github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7P
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/informalsystems/ibc-go/v3 v3.0.0-beta1.0.20221116144303-1e70792920f6 h1:e/G7C3YHFLY77ohtVCyxtDeGDGvRkbyu1UYOlqDbWDU=
-github.com/informalsystems/ibc-go/v3 v3.0.0-beta1.0.20221116144303-1e70792920f6/go.mod h1:HK6fQYzqivKkZ0Vgl/vh1kJz5D3dyKN2N/CWpEJvXgk=
+github.com/informalsystems/ibc-go/v3 v3.0.0-beta1.0.20221121181828-c75c185d20b2 h1:i9xbwqor18BxeFirWpH7N2qeJAl+VgydZN/R+S4KYks=
+github.com/informalsystems/ibc-go/v3 v3.0.0-beta1.0.20221121181828-c75c185d20b2/go.mod h1:HK6fQYzqivKkZ0Vgl/vh1kJz5D3dyKN2N/CWpEJvXgk=
 github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=

tests/e2e/channel_init.go

@@ -37,7 +37,7 @@ func (suite *CCVTestSuite) TestConsumerGenesis() {
 	_, ok = suite.consumerApp.GetIBCKeeper().ClientKeeper.GetClientState(ctx, clientId)
 	suite.Require().True(ok)
 
-	suite.SetupCCVChannel()
+	suite.SetupCCVChannel(suite.path)
 
 	origTime := suite.consumerChain.GetContext().BlockTime()
 

tests/e2e/common.go

@@ -6,19 +6,18 @@ import (
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	"github.com/cosmos/interchain-security/testutil/e2e"
-	providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types"
-	ccv "github.com/cosmos/interchain-security/x/ccv/types"
-	"github.com/stretchr/testify/require"
-	abci "github.com/tendermint/tendermint/abci/types"
-
 	clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
 	commitmenttypes "github.com/cosmos/ibc-go/v3/modules/core/23-commitment/types"
 	"github.com/cosmos/ibc-go/v3/modules/core/exported"
 	ibctm "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
-	ibctmtypes "github.com/cosmos/ibc-go/v3/modules/light-clients/07-tendermint/types"
 	ibctesting "github.com/cosmos/ibc-go/v3/testing"
+	"github.com/cosmos/interchain-security/testutil/e2e"
+	icstestingutils "github.com/cosmos/interchain-security/testutil/ibc_testing"
+	providertypes "github.com/cosmos/interchain-security/x/ccv/provider/types"
+	ccv "github.com/cosmos/interchain-security/x/ccv/types"
+	"github.com/stretchr/testify/require"
+	abci "github.com/tendermint/tendermint/abci/types"
 )
 
 // ChainType defines the type of chain (either provider or consumer)
@@ -29,10 +28,16 @@ const (
 	Consumer
 )
 
+// firstConsumerBundle returns the bundle of the first consumer chain
+func (s *CCVTestSuite) getFirstBundle() icstestingutils.ConsumerBundle {
+	return *s.consumerBundles[icstestingutils.FirstConsumerChainID]
+}
+
 func (s *CCVTestSuite) providerCtx() sdk.Context {
 	return s.providerChain.GetContext()
 }
 
+// consumerCtx returns the context of only the FIRST consumer chain
 func (s *CCVTestSuite) consumerCtx() sdk.Context {
 	return s.consumerChain.GetContext()
 }
@@ -181,24 +186,25 @@ func relayAllCommittedPackets(
 	s *CCVTestSuite,
 	srcChain *ibctesting.TestChain,
 	path *ibctesting.Path,
-	portID string,
-	channelID string,
+	srcPortID string,
+	srcChannelID string,
 	expectedPackets int,
 ) {
 	// check that the packets are committed in  state
 	commitments := srcChain.App.GetIBCKeeper().ChannelKeeper.GetAllPacketCommitmentsAtChannel(
 		srcChain.GetContext(),
-		portID,
-		channelID,
+		srcPortID,
+		srcChannelID,
 	)
 	s.Require().Equal(expectedPackets, len(commitments),
 		"actual number of packet commitments does not match expectation")
 
 	// relay all packets from srcChain to counterparty
 	for _, commitment := range commitments {
 		// - get packets
-		packet, found := srcChain.GetSentPacket(commitment.Sequence)
+		packet, found := srcChain.GetSentPacket(commitment.Sequence, srcChannelID)
 		s.Require().True(found, "did not find sent packet")
+
 		// - relay the packet
 		err := path.RelayPacket(packet)
 		s.Require().NoError(err)
@@ -425,7 +431,7 @@ func (suite *CCVTestSuite) CreateCustomClient(endpoint *ibctesting.Endpoint, unb
 
 	height := endpoint.Counterparty.Chain.LastHeader.GetHeight().(clienttypes.Height)
 	UpgradePath := []string{"upgrade", "upgradedIBCState"}
-	clientState := ibctmtypes.NewClientState(
+	clientState := ibctm.NewClientState(
 		endpoint.Counterparty.Chain.ChainID, tmConfig.TrustLevel, tmConfig.TrustingPeriod, tmConfig.UnbondingPeriod, tmConfig.MaxClockDrift,
 		height, commitmenttypes.GetSDKSpecs(), UpgradePath, tmConfig.AllowUpdateAfterExpiry, tmConfig.AllowUpdateAfterMisbehaviour,
 	)
@@ -443,17 +449,22 @@ func (suite *CCVTestSuite) CreateCustomClient(endpoint *ibctesting.Endpoint, unb
 	require.NoError(endpoint.Chain.T, err)
 }
 
-func (suite *CCVTestSuite) GetConsumerEndpointClientAndConsState() (exported.ClientState, exported.ConsensusState) {
+// GetConsumerEndpointClientAndConsState returns the client and consensus state
+// for a particular consumer endpoint, as specified by the consumer's bundle.
+func (suite *CCVTestSuite) GetConsumerEndpointClientAndConsState(
+	consumerBundle icstestingutils.ConsumerBundle) (exported.ClientState, exported.ConsensusState) {
+
+	ctx := consumerBundle.GetCtx()
+	consumerKeeper := consumerBundle.GetKeeper()
 
-	clientID, found := suite.consumerApp.GetConsumerKeeper().GetProviderClientID(suite.consumerCtx())
+	clientID, found := consumerKeeper.GetProviderClientID(ctx)
 	suite.Require().True(found)
 
-	clientState, found := suite.consumerApp.GetIBCKeeper().ClientKeeper.GetClientState(
-		suite.consumerCtx(), clientID)
+	clientState, found := consumerBundle.App.GetIBCKeeper().ClientKeeper.GetClientState(ctx, clientID)
 	suite.Require().True(found)
 
-	consState, found := suite.consumerApp.GetIBCKeeper().ClientKeeper.GetClientConsensusState(
-		suite.consumerCtx(), clientID, clientState.GetLatestHeight())
+	consState, found := consumerBundle.App.GetIBCKeeper().ClientKeeper.GetClientConsensusState(
+		ctx, clientID, clientState.GetLatestHeight())
 	suite.Require().True(found)
 
 	return clientState, consState

tests/e2e/distribution.go

@@ -14,7 +14,7 @@ import (
 func (s *CCVTestSuite) TestRewardsDistribution() {
 
 	//set up channel and delegate some tokens in order for validator set update to be sent to the consumer chain
-	s.SetupCCVChannel()
+	s.SetupCCVChannel(s.path)
 	s.SetupTransferChannel()
 	bondAmt := sdk.NewInt(10000000)
 	delAddr := s.providerChain.SenderAccount.GetAddress()

tests/e2e/expired_client.go

@@ -20,7 +20,7 @@ import (
 func (s *CCVTestSuite) TestVSCPacketSendExpiredClient() {
 	providerKeeper := s.providerApp.GetProviderKeeper()
 
-	s.SetupCCVChannel()
+	s.SetupCCVChannel(s.path)
 
 	expireClient(s, Consumer)
 
@@ -85,7 +85,7 @@ func (s *CCVTestSuite) TestConsumerPacketSendExpiredClient() {
 	providerKeeper := s.providerApp.GetProviderKeeper()
 	consumerKeeper := s.consumerApp.GetConsumerKeeper()
 
-	s.SetupCCVChannel()
+	s.SetupCCVChannel(s.path)
 
 	// bond some tokens on provider to change validator powers
 	bondAmt := sdk.NewInt(1000000)