log cleanup

cosmos · Jan 10, 2024 · 9724657 · 9724657
1 parent cb8b83f
commit 9724657
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 26 deletions.
diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go
@@ -486,8 +486,8 @@ type StartConsumerChainAction struct {
 
 // Transform consumer genesis content from older version
 func (tr *TestConfig) transformConsumerGenesis(consumerChain ChainID, genesis []byte, target ExecutionTarget) []byte {
-	log.Print("Transforming consumer genesis")
-	log.Printf("Original ccv genesis: %s\n", string(genesis))
+	fmt.Println("Transforming consumer genesis")
+	fmt.Printf("Original ccv genesis: %s\n", string(genesis))
 
 	fileName := "consumer_genesis.json"
 	file, err := os.CreateTemp("", fileName)
@@ -519,13 +519,13 @@ func (tr *TestConfig) transformConsumerGenesis(consumerChain ChainID, genesis []
 	if err != nil {
 		log.Fatal(err, "CCV consumer genesis transformation failed: %s", string(result))
 	}
-	log.Printf("Transformed genesis is: %s", string(result))
+	fmt.Printf("Transformed genesis is: %s\n", string(result))
 	return result
 }
 
 // Get consumer genesis from provider
 func (tr *TestConfig) getConsumerGenesis(providerChain, consumerChain ChainID, target ExecutionTarget) string {
-	log.Print("Exporting consumer genesis from provider")
+	fmt.Println("Exporting consumer genesis from provider")
 	providerBinaryName := tr.chainConfigs[providerChain].BinaryName
 
 	cmd := target.ExecCommand(
@@ -555,7 +555,7 @@ func (tr *TestConfig) startConsumerChain(
 	target ExecutionTarget,
 	verbose bool,
 ) {
-	log.Printf("Starting consumer chain %s", action.ConsumerChain)
+	fmt.Println("Starting consumer chain ", action.ConsumerChain)
 	consumerGenesis := ".app_state.ccvconsumer = " + tr.getConsumerGenesis(action.ProviderChain, action.ConsumerChain, target)
 	consumerGenesisChanges := tr.chainConfigs[action.ConsumerChain].GenesisChanges
 	if consumerGenesisChanges != "" {

diff --git a/tests/e2e/builder.go b/tests/e2e/builder.go
@@ -17,13 +17,13 @@ func setupWorkSpace(revision string) (string, error) {
 		return "", fmt.Errorf("error creating temp directory %v", err)
 	}
 
-	log.Printf("Setting up worktree in '%s'", workSpace)
+	fmt.Printf("Setting up worktree in '%s'", workSpace)
 
 	cmd := exec.Command("git", "worktree", "add",
 		"--checkout", workSpace, revision)
 	var errbuf bytes.Buffer
 	cmd.Stderr = &errbuf
-	log.Printf("Running: %s", cmd.String())
+	fmt.Printf("Running: %s", cmd.String())
 	if err := cmd.Start(); err != nil {
 		return "", err
 	}
@@ -59,7 +59,7 @@ func dockerIsUp() bool {
 
 // Build docker image of ICS for a given revision
 func buildDockerImage(imageName, revision string, targetCfg TargetConfig) error {
-	log.Printf("Building ICS %s image %s", revision, imageName)
+	fmt.Printf("Building ICS %s image %s\n", revision, imageName)
 	if !dockerIsUp() {
 		return fmt.Errorf("docker engine is not running")
 	}

diff --git a/tests/e2e/main.go b/tests/e2e/main.go
@@ -359,7 +359,7 @@ func executeTests(runners []TestRunner) error {
 				runner.Run()
 			}(runner)
 		} else {
-			log.Printf("=============== running %s ===============\n", runner.config.name)
+			fmt.Printf("=============== running %s ===============\n", runner.config.name)
 			err = runner.Run()
 		}
 	}

diff --git a/tests/e2e/state.go b/tests/e2e/state.go
@@ -101,10 +101,12 @@ type Param struct {
 	Value    string
 }
 
-func (tr TestConfig) getState(modelState State) State {
+func (tr TestConfig) getState(modelState State, verbose bool) State {
 	systemState := State{}
 	for k, modelState := range modelState {
-		log.Println("Getting model state for chain: ", k)
+		if verbose {
+			fmt.Println("Getting model state for chain: ", k)
+		}
 		systemState[k] = tr.getChainState(k, modelState)
 	}
 

diff --git a/tests/e2e/test_driver.go b/tests/e2e/test_driver.go
@@ -52,10 +52,7 @@ func (pr *DefaultDriver) runStep(step Step) error {
 		return err
 	}
 	modelState := step.State
-	actualState, err := pr.getState(step.State)
-	if err != nil {
-		return err
-	}
+	actualState := pr.testCfg.getState(modelState, pr.verbose)
 
 	// Check state
 	if !reflect.DeepEqual(actualState, modelState) {
@@ -68,10 +65,6 @@ func (pr *DefaultDriver) runStep(step Step) error {
 	return nil
 }
 
-func (pr *DefaultDriver) GetState(modelState State) {
-	pr.testCfg.getState(modelState)
-}
-
 func (td *DefaultDriver) runAction(action interface{}) error {
 	switch action := action.(type) {
 	case StartChainAction:
@@ -155,8 +148,3 @@ func (td *DefaultDriver) runAction(action interface{}) error {
 	}
 	return nil
 }
-
-func (pr *DefaultDriver) getState(modelState State) (State, error) {
-	// forwarding it for now
-	return pr.testCfg.getState(modelState), nil
-}
diff --git a/tests/e2e/test_target.go b/tests/e2e/test_target.go
@@ -147,12 +147,12 @@ func (dc *DockerContainer) ExecDetachedCommand(name string, arg ...string) *exec
 func (dc *DockerContainer) GetTestScriptPath(isConsumer bool, script string) string {
 	path := "/testnet-scripts"
 	if dc.targetConfig.providerVersion != "" && !isConsumer {
-		log.Printf("Using script path for provider version '%s'", dc.targetConfig.providerVersion)
+		fmt.Printf("Using script path for provider version '%s'\n", dc.targetConfig.providerVersion)
 		path = "/provider/testnet-scripts"
 	}
 
 	if dc.targetConfig.consumerVersion != "" && isConsumer {
-		log.Printf("Using script path for consumer version '%s'", dc.targetConfig.consumerVersion)
+		fmt.Printf("Using script path for consumer version '%s'\n", dc.targetConfig.consumerVersion)
 		path = "/consumer/testnet-scripts"
 	}
 	return strings.Join([]string{path, script}, string(os.PathSeparator))