add support for version specific actions

cosmos · Oct 16, 2024 · 76f2440 · 76f2440
1 parent 777c276
commit 76f2440
Show file tree

Hide file tree

Showing 19 changed files with 4,656 additions and 1,746 deletions.
diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go
diff --git a/tests/e2e/actions_consumer_misbehaviour.go b/tests/e2e/actions_consumer_misbehaviour.go
@@ -19,12 +19,12 @@ type ForkConsumerChainAction struct {
 }
 
 func (tc Chain) forkConsumerChain(action ForkConsumerChainAction, verbose bool) {
-	valCfg := tc.testConfig.validatorConfigs[action.Validator]
+	valCfg := tc.testConfig.ValidatorConfigs[action.Validator]
 	configureNodeCmd := tc.target.ExecCommand("/bin/bash",
-		"/testnet-scripts/fork-consumer.sh", tc.testConfig.chainConfigs[action.ConsumerChain].BinaryName,
+		"/testnet-scripts/fork-consumer.sh", tc.testConfig.ChainConfigs[action.ConsumerChain].BinaryName,
 		string(action.Validator), string(action.ConsumerChain),
-		tc.testConfig.chainConfigs[action.ConsumerChain].IpPrefix,
-		tc.testConfig.chainConfigs[action.ProviderChain].IpPrefix,
+		tc.testConfig.ChainConfigs[action.ConsumerChain].IpPrefix,
+		tc.testConfig.ChainConfigs[action.ProviderChain].IpPrefix,
 		valCfg.Mnemonic,
 		action.RelayerConfig,
 	)
@@ -103,7 +103,7 @@ type SubmitConsumerMisbehaviourAction struct {
 }
 
 func (tr Chain) submitConsumerMisbehaviour(action SubmitConsumerMisbehaviourAction, verbose bool) {
-	consumerBinaryName := tr.testConfig.chainConfigs[action.FromChain].BinaryName
+	consumerBinaryName := tr.testConfig.ChainConfigs[action.FromChain].BinaryName
 
 	// retrieve a trusted height of the consumer client from the provider
 	trustedHeight, _ := tr.target.GetTrustedHeight(action.ToChain, action.ClientID, 2)
@@ -134,7 +134,7 @@ func (tr Chain) submitConsumerMisbehaviour(action SubmitConsumerMisbehaviourActi
 	cmd = tr.target.ExecCommand(
 		consumerBinaryName,
 		"query", "ibc", "client", "header", "--height", strconv.Itoa(int(currHeight)),
-		`--node`, fmt.Sprintf("tcp://%s.252:26658", tr.testConfig.chainConfigs[action.FromChain].IpPrefix),
+		`--node`, fmt.Sprintf("tcp://%s.252:26658", tr.testConfig.ChainConfigs[action.FromChain].IpPrefix),
 		`-o`, `json`,
 	)
 
@@ -148,7 +148,7 @@ func (tr Chain) submitConsumerMisbehaviour(action SubmitConsumerMisbehaviourActi
 	cmd = tr.target.ExecCommand(
 		consumerBinaryName,
 		"query", "ibc", "client", "header", "--height", strconv.Itoa(int(trustedHeight+1)),
-		`--node`, fmt.Sprintf("tcp://%s.252:26658", tr.testConfig.chainConfigs[action.FromChain].IpPrefix),
+		`--node`, fmt.Sprintf("tcp://%s.252:26658", tr.testConfig.ChainConfigs[action.FromChain].IpPrefix),
 		`-o`, `json`,
 	)
 
@@ -178,11 +178,11 @@ func (tr Chain) submitConsumerMisbehaviour(action SubmitConsumerMisbehaviourActi
 	gas := "auto"
 	submitMisb := fmt.Sprintf(
 		`%s tx provider submit-consumer-misbehaviour %s %s --from validator%s --chain-id %s --home %s --node %s --gas %s --keyring-backend test -y`,
-		tr.testConfig.chainConfigs[ChainID("provi")].BinaryName,
-		string(tr.testConfig.chainConfigs[action.FromChain].ConsumerId),
+		tr.testConfig.ChainConfigs[ChainID("provi")].BinaryName,
+		string(tr.testConfig.ChainConfigs[action.FromChain].ConsumerId),
 		misbPath,
 		action.Submitter,
-		tr.testConfig.chainConfigs[ChainID("provi")].ChainId,
+		tr.testConfig.ChainConfigs[ChainID("provi")].ChainId,
 		tr.getValidatorHome(ChainID("provi"), action.Submitter),
 		tr.getValidatorNode(ChainID("provi"), action.Submitter),
 		gas,

diff --git a/tests/e2e/actions_sovereign_chain.go b/tests/e2e/actions_sovereign_chain.go
@@ -6,22 +6,17 @@ import (
 	"fmt"
 	"log"
 	"time"
-)
 
-type StartSovereignChainAction struct {
-	Chain      ChainID
-	Validators []StartChainValidator
-	// Genesis changes specific to this action, appended to genesis changes defined in chain config
-	GenesisChanges string
-}
+	e2e "github.com/cosmos/interchain-security/v6/tests/e2e/testlib"
+)
 
 // calls a simplified startup script (start-sovereign.sh) and runs a validator node
 // upgrades are simpler with a single validator node since only one node needs to be upgraded
 func (tr Chain) startSovereignChain(
-	action StartSovereignChainAction,
+	action e2e.StartSovereignChainAction,
 	verbose bool,
 ) {
-	chainConfig := tr.testConfig.chainConfigs["sover"]
+	chainConfig := tr.testConfig.ChainConfigs["sover"]
 	type jsonValAttrs struct {
 		Mnemonic         string `json:"mnemonic"`
 		Allocation       string `json:"allocation"`
@@ -39,18 +34,18 @@ func (tr Chain) startSovereignChain(
 	var validators []jsonValAttrs
 	for _, val := range action.Validators {
 		validators = append(validators, jsonValAttrs{
-			Mnemonic:         tr.testConfig.validatorConfigs[val.Id].Mnemonic,
-			NodeKey:          tr.testConfig.validatorConfigs[val.Id].NodeKey,
+			Mnemonic:         tr.testConfig.ValidatorConfigs[val.Id].Mnemonic,
+			NodeKey:          tr.testConfig.ValidatorConfigs[val.Id].NodeKey,
 			ValId:            fmt.Sprint(val.Id),
-			PrivValidatorKey: tr.testConfig.validatorConfigs[val.Id].PrivValidatorKey,
+			PrivValidatorKey: tr.testConfig.ValidatorConfigs[val.Id].PrivValidatorKey,
 			Allocation:       fmt.Sprint(val.Allocation) + "stake",
 			Stake:            fmt.Sprint(val.Stake) + "stake",
-			IpSuffix:         tr.testConfig.validatorConfigs[val.Id].IpSuffix,
+			IpSuffix:         tr.testConfig.ValidatorConfigs[val.Id].IpSuffix,
 
-			ConsumerMnemonic:         tr.testConfig.validatorConfigs[val.Id].ConsumerMnemonic,
-			ConsumerPrivValidatorKey: tr.testConfig.validatorConfigs[val.Id].ConsumerPrivValidatorKey,
+			ConsumerMnemonic:         tr.testConfig.ValidatorConfigs[val.Id].ConsumerMnemonic,
+			ConsumerPrivValidatorKey: tr.testConfig.ValidatorConfigs[val.Id].ConsumerPrivValidatorKey,
 			// if true node will be started with consumer key for each consumer chain
-			StartWithConsumerKey: tr.testConfig.validatorConfigs[val.Id].UseConsumerKey,
+			StartWithConsumerKey: tr.testConfig.ValidatorConfigs[val.Id].UseConsumerKey,
 		})
 	}
 
@@ -71,7 +66,7 @@ func (tr Chain) startSovereignChain(
 	testScriptPath := tr.target.GetTestScriptPath(isConsumer, "start-sovereign.sh")
 	cmd := tr.target.ExecCommand("/bin/bash", testScriptPath, chainConfig.BinaryName, string(vals),
 		string(chainConfig.ChainId), chainConfig.IpPrefix, genesisChanges,
-		tr.testConfig.tendermintConfigOverride)
+		tr.testConfig.TendermintConfigOverride)
 
 	cmdReader, err := cmd.StdoutPipe()
 	if err != nil {
@@ -113,7 +108,7 @@ type UpgradeProposalAction struct {
 
 func (tr *Chain) submitUpgradeProposal(action UpgradeProposalAction, verbose bool) {
 	// Get authority address
-	binary := tr.testConfig.chainConfigs[ChainID("sover")].BinaryName
+	binary := tr.testConfig.ChainConfigs[ChainID("sover")].BinaryName
 	cmd := tr.target.ExecCommand(binary,
 		"query", "upgrade", "authority",
 		"--node", tr.getValidatorNode(ChainID("sover"), action.Proposer),
@@ -171,7 +166,7 @@ func (tr *Chain) submitUpgradeProposal(action UpgradeProposalAction, verbose boo
 		"--gas", "900000",
 		"--from", "validator"+string(action.Proposer),
 		"--keyring-backend", "test",
-		"--chain-id", string(tr.testConfig.chainConfigs[ChainID("sover")].ChainId),
+		"--chain-id", string(tr.testConfig.ChainConfigs[ChainID("sover")].ChainId),
 		"--home", tr.getValidatorHome(ChainID("sover"), action.Proposer),
 		"--node", tr.getValidatorNode(ChainID("sover"), action.Proposer),
 		"-y")

diff --git a/tests/e2e/builder.go b/tests/e2e/builder.go
@@ -245,7 +245,8 @@ func buildDockerImage(version string, targetCfg TargetConfig, noCache bool) (str
 	out, err := cmd.CombinedOutput()
 	if err != nil && !noCache {
 		// Retry image creation from pristine state by enforcing --no-cache
-		log.Printf("Image creation failed '%v'. Re-trying without cache!", err)
+		log.Printf("Image creation failed '%v'.\n%s\nRe-trying without cache!",
+			err, string(out))
 		return buildDockerImage(version, targetCfg, true)
 	}
 	if err != nil {