Fix integration test driver #167 (#166)

* go mod replace * main use fatalf log * Apply changes from 1e2ad61 * go mod, actions Co-authored-by: Daniel <danwtisdall@gmail.com>
cosmos · Jun 29, 2022 · deee1da · deee1da
1 parent a5c7330
commit deee1da
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 24 deletions.
diff --git a/integration-tests/actions.go b/integration-tests/actions.go
@@ -26,7 +26,7 @@ func (s System) sendTokens(
 	verbose bool,
 ) {
 	binaryName := s.chainConfigs[action.chain].binaryName
-	bz, err := exec.Command("docker", "exec", s.containerConfig.instanceName, binaryName,
+	cmd := exec.Command("docker", "exec", s.containerConfig.instanceName, binaryName,
 
 		"tx", "bank", "send",
 		s.validatorConfigs[action.from].delAddress,
@@ -39,7 +39,11 @@ func (s System) sendTokens(
 		`--keyring-backend`, `test`,
 		`-b`, `block`,
 		`-y`,
-	).CombinedOutput()
+	)
+	if verbose {
+		fmt.Println("sendTokens cmd:", cmd.String())
+	}
+	bz, err := cmd.CombinedOutput()
 
 	if err != nil {
 		log.Fatal(err, "\n", string(bz))
@@ -290,14 +294,20 @@ func (s System) startConsumerChain(
 	action StartConsumerChainAction,
 	verbose bool,
 ) {
-	bz, err := exec.Command("docker", "exec", s.containerConfig.instanceName, s.chainConfigs[action.consumerChain].binaryName,
+	cmd := exec.Command("docker", "exec", s.containerConfig.instanceName, s.chainConfigs[action.providerChain].binaryName,
 
 		"query", "provider", "consumer-genesis",
 		s.chainConfigs[action.consumerChain].chainId,
 
 		`--node`, s.getValidatorNode(action.providerChain, s.getValidatorNum(action.providerChain)),
 		`-o`, `json`,
-	).CombinedOutput()
+	)
+
+	if verbose {
+		log.Println("startConsumerChain cmd: ", cmd.String())
+	}
+
+	bz, err := cmd.CombinedOutput()
 
 	if err != nil {
 		log.Fatal(err, "\n", string(bz))
@@ -438,18 +448,20 @@ func (s System) addIbcChannel(
 	action AddIbcChannelAction,
 	verbose bool,
 ) {
-	// // hermes create channel ibc-1 ibc-2 --port-a transfer --port-b transfer -o unordered
 	cmd := exec.Command("docker", "exec", s.containerConfig.instanceName, "/root/.cargo/bin/hermes",
 		"create", "channel",
-		s.chainConfigs[action.chainA].chainId,
+		"--order", action.order,
+		"--channel-version", s.containerConfig.ccvVersion,
+		"--connection-a", "connection-"+fmt.Sprint(action.connectionA),
 		"--port-a", action.portA,
 		"--port-b", action.portB,
-		"-o", action.order,
-		"--channel-version", s.containerConfig.ccvVersion,
-		// "--connection-a",
-		"connection-"+fmt.Sprint(action.connectionA),
+		s.chainConfigs[action.chainA].chainId,
 	)
 
+	if verbose {
+		fmt.Println("addIbcChannel cmd:", cmd.String())
+	}
+
 	cmdReader, err := cmd.StdoutPipe()
 	if err != nil {
 		log.Fatal(err)
@@ -487,9 +499,13 @@ func (s System) relayPackets(
 	verbose bool,
 ) {
 	// hermes clear packets ibc0 transfer channel-13
-	bz, err := exec.Command("docker", "exec", s.containerConfig.instanceName, "/root/.cargo/bin/hermes", "clear", "packets",
+	cmd := exec.Command("docker", "exec", s.containerConfig.instanceName, "/root/.cargo/bin/hermes", "clear", "packets",
 		s.chainConfigs[action.chain].chainId, action.port, "channel-"+fmt.Sprint(action.channel),
-	).CombinedOutput()
+	)
+	if verbose {
+		log.Println("relayPackets cmd:", cmd.String())
+	}
+	bz, err := cmd.CombinedOutput()
 
 	if err != nil {
 		log.Fatal(err, "\n", string(bz))

diff --git a/integration-tests/main.go b/integration-tests/main.go
@@ -50,7 +50,7 @@ func (s System) runStep(step Step, verbose bool) {
 	case DelegateTokensAction:
 		s.delegateTokens(action, verbose)
 	default:
-		log.Fatal(fmt.Sprintf(`unknown action: %#v`, action))
+		log.Fatalf(fmt.Sprintf(`unknown action: %#v`, action))
 	}
 
 	modelState := step.state

diff --git a/integration-tests/testnet-scripts/start-chain.sh b/integration-tests/testnet-scripts/start-chain.sh
@@ -103,17 +103,19 @@ do
     fi
 
     # Make a gentx (this command also sets up validator state on disk even if we are not going to use the gentx for anything)
-    STAKE_AMOUNT=$(echo "$VALIDATORS" | jq -r ".[$i].stake")
-    $BIN gentx validator$VAL_ID "$STAKE_AMOUNT" \
-        --home /$CHAIN_ID/validator$VAL_ID \
-        --keyring-backend test \
-        --moniker validator$VAL_ID \
-        --chain-id=$CHAIN_ID
-
-    # Copy gentxs to the first validator for possible future collection. 
-    # Obviously we don't need to copy the first validator's gentx to itself
-    if [ $VAL_ID != $FIRST_VAL_ID ]; then
-        cp /$CHAIN_ID/validator$VAL_ID/config/gentx/* /$CHAIN_ID/validator$FIRST_VAL_ID/config/gentx/
+    if [ "$SKIP_GENTX" = "false" ] ; then 
+        STAKE_AMOUNT=$(echo "$VALIDATORS" | jq -r ".[$i].stake")
+        $BIN gentx validator$VAL_ID "$STAKE_AMOUNT" \
+            --home /$CHAIN_ID/validator$VAL_ID \
+            --keyring-backend test \
+            --moniker validator$VAL_ID \
+            --chain-id=$CHAIN_ID
+
+        # Copy gentxs to the first validator for possible future collection. 
+        # Obviously we don't need to copy the first validator's gentx to itself
+        if [ $VAL_ID != $FIRST_VAL_ID ]; then
+            cp /$CHAIN_ID/validator$VAL_ID/config/gentx/* /$CHAIN_ID/validator$FIRST_VAL_ID/config/gentx/
+        fi
     fi
 
     # Modify tendermint configs of validator