appease linter; rm logs

cosmos · Jun 16, 2023 · aa66dd8 · aa66dd8
1 parent fdaed77
commit aa66dd8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 19 deletions.
diff --git a/tests/e2e/main.go b/tests/e2e/main.go
@@ -51,14 +51,13 @@ func main() {
 
 	if happyPathOnly != nil && *happyPathOnly {
 		fmt.Println("=============== running happy path only ===============")
-		tr := ChangeoverTestRun()
-		tr.Run(changeoverSteps, *localSdkPath, *useGaia, *gaiaTag)
-		// tr := DefaultTestRun()
-		// tr.Run(happyPathSteps, *localSdkPath, *useGaia, *gaiaTag)
+		tr := DefaultTestRun()
+		tr.Run(happyPathSteps, *localSdkPath, *useGaia, *gaiaTag)
 		return
 	}
 
 	testRuns := []testRunWithSteps{
+		{ChangeoverTestRun(), changeoverSteps},
 		{DefaultTestRun(), happyPathSteps},
 		{DemocracyTestRun(true), democracySteps},
 		{DemocracyTestRun(false), rewardDenomConsumerSteps},
@@ -102,7 +101,7 @@ func (tr *TestRun) Run(steps []Step, localSdkPath string, useGaia bool, gaiaTag
 	tr.validateStringLiterals()
 	tr.startDocker()
 	tr.executeSteps(steps)
-	// tr.teardownDocker()
+	tr.teardownDocker()
 }
 
 type testRunWithSteps struct {

diff --git a/tests/e2e/steps_sovereign_changeover.go b/tests/e2e/steps_sovereign_changeover.go
@@ -36,7 +36,7 @@ func stepsChangeoverToConsumer(consumerName string) []Step {
 				from:                validatorID("alice"),
 				deposit:             10000001,
 				consumerChain:       chainID(consumerName),
-				distributionChannel: "transfer", // consumer's channel end
+				distributionChannel: "channel-0", // consumer's channel end
 				spawnTime:           0,
 				initialHeight:       clienttypes.Height{RevisionNumber: 0, RevisionHeight: 111}, // 1 block after upgrade !important
 			},

diff --git a/x/ccv/consumer/ibc_module.go b/x/ccv/consumer/ibc_module.go
@@ -142,12 +142,10 @@ func (am AppModule) OnChanOpenAck(
 
 	// First check if an existing transfer channel already exists.
 	transChannelID := am.keeper.GetDistributionTransmissionChannel(ctx)
-	am.keeper.Logger(ctx).Error("transChannelID", "transChannelID", transChannelID)
 	if found := am.keeper.TransferChannelExists(ctx, transChannelID); found {
-		am.keeper.Logger(ctx).Error("transChannelID", "NOT FOUND", "RETURNING")
 		return nil
 	}
-	am.keeper.Logger(ctx).Error("transChannelID", "FOUND", transChannelID)
+
 	// NOTE The handshake for this channel is handled by the ibc-go/transfer
 	// module. If the transfer-channel fails here (unlikely) then the transfer
 	// channel should be manually created and ccv parameters set accordingly.

diff --git a/x/ccv/consumer/keeper/changeover.go b/x/ccv/consumer/keeper/changeover.go
@@ -1,8 +1,6 @@
 package keeper
 
 import (
-	"encoding/json"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 )
@@ -32,8 +30,6 @@ func (k Keeper) ChangeoverToConsumer(ctx sdk.Context) (initialValUpdates []abci.
 	// populate cross chain validators states with initial valset
 	initialValUpdates = k.GetInitialValSet(ctx)
 	k.ApplyCCValidatorChanges(ctx, initialValUpdates)
-	buf, _ := json.Marshal(initialValUpdates)
-	k.Logger(ctx).Error("Changeover to consumer complete", "initialValUpdates", string(buf))
 
 	// Add validator updates to initialValUpdates, such that the "old" validators returned from standalone staking module
 	// are given zero power, and the provider validators are given their full power.
@@ -52,5 +48,6 @@ func (k Keeper) ChangeoverToConsumer(ctx sdk.Context) (initialValUpdates []abci.
 	// Therefore we set the PreCCV state to false so the endblocker caller doesn't call this method again.
 	k.DeletePreCCV(ctx)
 
+	k.Logger(ctx).Info("ICS changeover complete - you are now a consumer chain!")
 	return initialValUpdates
 }
diff --git a/x/ccv/consumer/keeper/genesis.go b/x/ccv/consumer/keeper/genesis.go
@@ -27,7 +27,6 @@ func (k Keeper) InitGenesis(ctx sdk.Context, state *consumertypes.GenesisState)
 		k.SetPreCCVTrue(ctx)
 		k.MarkAsPrevStandaloneChain(ctx)
 		k.SetInitialValSet(ctx, state.InitialValSet)
-		k.Logger(ctx).Error("PRECCV CHAIN", "height", ctx.BlockHeight())
 	}
 	k.SetInitGenesisHeight(ctx, ctx.BlockHeight()) // Usually 0, but not the case for changeover chains
 
@@ -55,7 +54,6 @@ func (k Keeper) InitGenesis(ctx sdk.Context, state *consumertypes.GenesisState)
 	// initialValSet is checked in NewChain case by ValidateGenesis
 	// start a new chain
 	if state.NewChain {
-		k.Logger(ctx).Error("NEW CHAIN IN INIT GENESIS")
 		// create the provider client in InitGenesis for new consumer chain. CCV Handshake must be established with this client id.
 		clientID, err := k.clientKeeper.CreateClient(ctx, state.ProviderClientState, state.ProviderConsensusState)
 		if err != nil {
@@ -71,7 +69,6 @@ func (k Keeper) InitGenesis(ctx sdk.Context, state *consumertypes.GenesisState)
 
 	} else {
 		// chain restarts with the CCV channel established
-		k.Logger(ctx).Error("APPARENTLY IT'S NOT NEW")
 		if state.ProviderChannelId != "" {
 			// set provider channel ID
 			k.SetProviderChannel(ctx, state.ProviderChannelId)
@@ -106,7 +103,6 @@ func (k Keeper) InitGenesis(ctx sdk.Context, state *consumertypes.GenesisState)
 	}
 
 	if state.PreCCV {
-		k.Logger(ctx).Error("PRECCV SO RETURNING EMPTY VALSET AFTERALL...")
 		return []abci.ValidatorUpdate{}
 	}
 

diff --git a/x/ccv/consumer/module.go b/x/ccv/consumer/module.go
@@ -195,8 +195,6 @@ func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.V
 	// that was just upgraded to include the consumer ccv module, execute changeover logic.
 	if am.keeper.IsPreCCV(ctx) {
 		initialValUpdates := am.keeper.ChangeoverToConsumer(ctx)
-		buf, _ := json.Marshal(initialValUpdates)
-		am.keeper.Logger(ctx).Error("ChangeoverToConsumer", string(buf))
 		return initialValUpdates
 	}