Renames child,parent->consumer,provider

cmd/interchain-security-cd/main.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
-	app "github.com/cosmos/interchain-security/app_child"
+	app "github.com/cosmos/interchain-security/app_consumer"
 	"github.com/tendermint/spm/cosmoscmd"
 )
 

cmd/interchain-security-pd/main.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
-	app "github.com/cosmos/interchain-security/app_parent"
+	app "github.com/cosmos/interchain-security/app_provider"
 	"github.com/tendermint/spm/cosmoscmd"
 )
 

testutil/simapp/simapp.go

@@ -16,8 +16,8 @@ import (
 	tmtypes "github.com/tendermint/tendermint/types"
 	tmdb "github.com/tendermint/tm-db"
 
-	childApp "github.com/cosmos/interchain-security/app_child"
-	parentApp "github.com/cosmos/interchain-security/app_parent"
+	appConsumer "github.com/cosmos/interchain-security/app_consumer"
+	appProvider "github.com/cosmos/interchain-security/app_provider"
 )
 
 var defaultConsensusParams = &abci.ConsensusParams{
@@ -37,20 +37,20 @@ var defaultConsensusParams = &abci.ConsensusParams{
 	},
 }
 
-func SetupTestingParentApp() (ibctesting.TestingApp, map[string]json.RawMessage) {
+func SetupTestingappProvider() (ibctesting.TestingApp, map[string]json.RawMessage) {
 	db := tmdb.NewMemDB()
 	// encCdc := app.MakeTestEncodingConfig()
-	encoding := cosmoscmd.MakeEncodingConfig(parentApp.ModuleBasics)
-	testApp := parentApp.New(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, encoding, simapp.EmptyAppOptions{}).(ibctesting.TestingApp)
-	return testApp, parentApp.NewDefaultGenesisState(encoding.Marshaler)
+	encoding := cosmoscmd.MakeEncodingConfig(appProvider.ModuleBasics)
+	testApp := appProvider.New(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, encoding, simapp.EmptyAppOptions{}).(ibctesting.TestingApp)
+	return testApp, appProvider.NewDefaultGenesisState(encoding.Marshaler)
 }
 
-func SetupTestingChildApp() (ibctesting.TestingApp, map[string]json.RawMessage) {
+func SetupTestingappConsumer() (ibctesting.TestingApp, map[string]json.RawMessage) {
 	db := tmdb.NewMemDB()
 	// encCdc := app.MakeTestEncodingConfig()
-	encoding := cosmoscmd.MakeEncodingConfig(childApp.ModuleBasics)
-	testApp := childApp.New(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, encoding, simapp.EmptyAppOptions{}).(ibctesting.TestingApp)
-	return testApp, childApp.NewDefaultGenesisState(encoding.Marshaler)
+	encoding := cosmoscmd.MakeEncodingConfig(appConsumer.ModuleBasics)
+	testApp := appConsumer.New(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, encoding, simapp.EmptyAppOptions{}).(ibctesting.TestingApp)
+	return testApp, appConsumer.NewDefaultGenesisState(encoding.Marshaler)
 }
 
 // NewCoordinator initializes Coordinator with 0 TestChains
@@ -68,11 +68,11 @@ func NewBasicCoordinator(t *testing.T) *ibctesting.Coordinator {
 func NewParentChildCoordinator(t *testing.T) (*ibctesting.Coordinator, *ibctesting.TestChain, *ibctesting.TestChain) {
 	coordinator := NewBasicCoordinator(t)
 	chainID := ibctesting.GetChainID(0)
-	coordinator.Chains[chainID] = ibctesting.NewTestChain(t, coordinator, SetupTestingParentApp, chainID)
+	coordinator.Chains[chainID] = ibctesting.NewTestChain(t, coordinator, SetupTestingappProvider, chainID)
 	parentChain := coordinator.GetChain(chainID)
 	chainID = ibctesting.GetChainID(1)
 	coordinator.Chains[chainID] = ibctesting.NewTestChainWithValSet(t, coordinator,
-		SetupTestingChildApp, chainID, parentChain.Vals, parentChain.Signers)
+		SetupTestingappConsumer, chainID, parentChain.Vals, parentChain.Signers)
 	childChain := coordinator.GetChain(chainID)
 	return coordinator, parentChain, childChain
 }

x/ccv/child/keeper/genesis_test.go

@@ -11,28 +11,28 @@ import (
 	parenttypes "github.com/cosmos/interchain-security/x/ccv/parent/types"
 	"github.com/cosmos/interchain-security/x/ccv/types"
 
-	childApp "github.com/cosmos/interchain-security/app_child"
+	appConsumer "github.com/cosmos/interchain-security/app_consumer"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmtypes "github.com/tendermint/tendermint/types"
 )
 
 func (suite *KeeperTestSuite) TestGenesis() {
-	genesis := suite.childChain.App.(*childApp.App).ChildKeeper.ExportGenesis(suite.childChain.GetContext())
+	genesis := suite.childChain.App.(*appConsumer.App).ChildKeeper.ExportGenesis(suite.childChain.GetContext())
 
 	suite.Require().Equal(suite.parentClient, genesis.ParentClientState)
 	suite.Require().Equal(suite.parentConsState, genesis.ParentConsensusState)
 
 	suite.Require().NotPanics(func() {
-		suite.childChain.App.(*childApp.App).ChildKeeper.InitGenesis(suite.childChain.GetContext(), genesis)
+		suite.childChain.App.(*appConsumer.App).ChildKeeper.InitGenesis(suite.childChain.GetContext(), genesis)
 		// reset suite to reset parent client
 		suite.SetupTest()
 	})
 
 	ctx := suite.childChain.GetContext()
-	portId := suite.childChain.App.(*childApp.App).ChildKeeper.GetPort(ctx)
+	portId := suite.childChain.App.(*appConsumer.App).ChildKeeper.GetPort(ctx)
 	suite.Require().Equal(childtypes.PortID, portId)
 
-	clientId, ok := suite.childChain.App.(*childApp.App).ChildKeeper.GetParentClient(ctx)
+	clientId, ok := suite.childChain.App.(*appConsumer.App).ChildKeeper.GetParentClient(ctx)
 	suite.Require().True(ok)
 	clientState, ok := suite.childChain.App.GetIBCKeeper().ClientKeeper.GetClientState(ctx, clientId)
 	suite.Require().True(ok)
@@ -62,25 +62,25 @@ func (suite *KeeperTestSuite) TestGenesis() {
 	)
 	packet := channeltypes.NewPacket(pd.GetBytes(), 1, parenttypes.PortID, suite.path.EndpointB.ChannelID, childtypes.PortID, suite.path.EndpointA.ChannelID,
 		clienttypes.NewHeight(1, 0), 0)
-	suite.childChain.App.(*childApp.App).ChildKeeper.OnRecvPacket(suite.childChain.GetContext(), packet, pd)
+	suite.childChain.App.(*appConsumer.App).ChildKeeper.OnRecvPacket(suite.childChain.GetContext(), packet, pd)
 
 	// mocking the fact that child chain validators should be parent chain validators
 	// TODO: Fix testing suite so we can initialize both chains with the same validator set
 	valUpdates := tmtypes.TM2PB.ValidatorUpdates(suite.parentChain.Vals)
 
-	restartGenesis := suite.childChain.App.(*childApp.App).ChildKeeper.ExportGenesis(suite.childChain.GetContext())
+	restartGenesis := suite.childChain.App.(*appConsumer.App).ChildKeeper.ExportGenesis(suite.childChain.GetContext())
 	restartGenesis.InitialValSet = valUpdates
 
 	// ensure reset genesis is set correctly
 	parentChannel := suite.path.EndpointA.ChannelID
 	suite.Require().Equal(parentChannel, restartGenesis.ParentChannelId)
-	unbondingTime := suite.childChain.App.(*childApp.App).ChildKeeper.GetUnbondingTime(suite.childChain.GetContext(), 1)
+	unbondingTime := suite.childChain.App.(*appConsumer.App).ChildKeeper.GetUnbondingTime(suite.childChain.GetContext(), 1)
 	suite.Require().Equal(uint64(origTime.Add(childtypes.UnbondingTime).UnixNano()), unbondingTime, "unbonding time is not set correctly in genesis")
-	unbondingPacket, err := suite.childChain.App.(*childApp.App).ChildKeeper.GetUnbondingPacket(suite.childChain.GetContext(), 1)
+	unbondingPacket, err := suite.childChain.App.(*appConsumer.App).ChildKeeper.GetUnbondingPacket(suite.childChain.GetContext(), 1)
 	suite.Require().NoError(err)
 	suite.Require().Equal(&packet, unbondingPacket, "unbonding packet is not set correctly in genesis")
 
 	suite.Require().NotPanics(func() {
-		suite.childChain.App.(*childApp.App).ChildKeeper.InitGenesis(suite.childChain.GetContext(), restartGenesis)
+		suite.childChain.App.(*appConsumer.App).ChildKeeper.InitGenesis(suite.childChain.GetContext(), restartGenesis)
 	})
 }