tests: Export struct fields in the e2e tests (#1313)

* Make struct fields in e2e exported * Un-capitalize binary name * Remove prop type * Channel to channel in comments
cosmos · Sep 19, 2023 · 99a171f · 99a171f
1 parent 27ef1d2
commit 99a171f
Show file tree

Hide file tree

Showing 19 changed files with 2,824 additions and 2,819 deletions.
diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go
diff --git a/tests/e2e/actions_sovereign_chain.go b/tests/e2e/actions_sovereign_chain.go
@@ -10,10 +10,10 @@ import (
 )
 
 type StartSovereignChainAction struct {
-	chain      chainID
-	validators []StartChainValidator
+	Chain      ChainID
+	Validators []StartChainValidator
 	// Genesis changes specific to this action, appended to genesis changes defined in chain config
-	genesisChanges string
+	GenesisChanges string
 }
 
 // calls a simplified startup script (start-sovereign.sh) and runs a validator node
@@ -38,20 +38,20 @@ func (tr TestRun) startSovereignChain(
 	}
 
 	var validators []jsonValAttrs
-	for _, val := range action.validators {
+	for _, val := range action.Validators {
 		validators = append(validators, jsonValAttrs{
-			Mnemonic:         tr.validatorConfigs[val.id].mnemonic,
-			NodeKey:          tr.validatorConfigs[val.id].nodeKey,
-			ValId:            fmt.Sprint(val.id),
-			PrivValidatorKey: tr.validatorConfigs[val.id].privValidatorKey,
-			Allocation:       fmt.Sprint(val.allocation) + "stake",
-			Stake:            fmt.Sprint(val.stake) + "stake",
-			IpSuffix:         tr.validatorConfigs[val.id].ipSuffix,
-
-			ConsumerMnemonic:         tr.validatorConfigs[val.id].consumerMnemonic,
-			ConsumerPrivValidatorKey: tr.validatorConfigs[val.id].consumerPrivValidatorKey,
+			Mnemonic:         tr.validatorConfigs[val.Id].Mnemonic,
+			NodeKey:          tr.validatorConfigs[val.Id].NodeKey,
+			ValId:            fmt.Sprint(val.Id),
+			PrivValidatorKey: tr.validatorConfigs[val.Id].PrivValidatorKey,
+			Allocation:       fmt.Sprint(val.Allocation) + "stake",
+			Stake:            fmt.Sprint(val.Stake) + "stake",
+			IpSuffix:         tr.validatorConfigs[val.Id].IpSuffix,
+
+			ConsumerMnemonic:         tr.validatorConfigs[val.Id].ConsumerMnemonic,
+			ConsumerPrivValidatorKey: tr.validatorConfigs[val.Id].ConsumerPrivValidatorKey,
 			// if true node will be started with consumer key for each consumer chain
-			StartWithConsumerKey: tr.validatorConfigs[val.id].useConsumerKey,
+			StartWithConsumerKey: tr.validatorConfigs[val.Id].UseConsumerKey,
 		})
 	}
 
@@ -62,16 +62,16 @@ func (tr TestRun) startSovereignChain(
 
 	// Concat genesis changes defined in chain config, with any custom genesis changes for this chain instantiation
 	var genesisChanges string
-	if action.genesisChanges != "" {
-		genesisChanges = chainConfig.genesisChanges + " | " + action.genesisChanges
+	if action.GenesisChanges != "" {
+		genesisChanges = chainConfig.GenesisChanges + " | " + action.GenesisChanges
 	} else {
-		genesisChanges = chainConfig.genesisChanges
+		genesisChanges = chainConfig.GenesisChanges
 	}
 
 	//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.
-	cmd := exec.Command("docker", "exec", tr.containerConfig.instanceName, "/bin/bash",
-		"/testnet-scripts/start-sovereign.sh", chainConfig.binaryName, string(vals),
-		string(chainConfig.chainId), chainConfig.ipPrefix, genesisChanges,
+	cmd := exec.Command("docker", "exec", tr.containerConfig.InstanceName, "/bin/bash",
+		"/testnet-scripts/start-sovereign.sh", chainConfig.BinaryName, string(vals),
+		string(chainConfig.ChainId), chainConfig.IpPrefix, genesisChanges,
 		tr.tendermintConfigOverride,
 	)
 
@@ -100,16 +100,16 @@ func (tr TestRun) startSovereignChain(
 		log.Fatal(err)
 	}
 	tr.addChainToRelayer(addChainToRelayerAction{
-		chain:     action.chain,
-		validator: action.validators[0].id,
+		Chain:     action.Chain,
+		Validator: action.Validators[0].Id,
 	}, verbose)
 }
 
 type LegacyUpgradeProposalAction struct {
-	chainID       chainID
-	upgradeTitle  string
-	proposer      validatorID
-	upgradeHeight uint64
+	ChainID       ChainID
+	UpgradeTitle  string
+	Proposer      ValidatorID
+	UpgradeHeight uint64
 }
 
 func (tr *TestRun) submitLegacyUpgradeProposal(action LegacyUpgradeProposalAction, verbose bool) {
@@ -128,18 +128,18 @@ func (tr *TestRun) submitLegacyUpgradeProposal(action LegacyUpgradeProposalActio
 		--node %s \
 		--no-validate \
 		-y`,
-		tr.chainConfigs[chainID("sover")].binaryName,
-		action.upgradeTitle,
-		action.upgradeTitle,
-		fmt.Sprint(action.upgradeHeight),
-		action.proposer,
-		tr.chainConfigs[chainID("sover")].chainId,
-		tr.getValidatorHome(chainID("sover"), action.proposer),
-		tr.getValidatorNode(chainID("sover"), action.proposer),
+		tr.chainConfigs[ChainID("sover")].BinaryName,
+		action.UpgradeTitle,
+		action.UpgradeTitle,
+		fmt.Sprint(action.UpgradeHeight),
+		action.Proposer,
+		tr.chainConfigs[ChainID("sover")].ChainId,
+		tr.getValidatorHome(ChainID("sover"), action.Proposer),
+		tr.getValidatorNode(ChainID("sover"), action.Proposer),
 	)
 	//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.
 	cmd := exec.Command("docker", "exec",
-		tr.containerConfig.instanceName,
+		tr.containerConfig.InstanceName,
 		"/bin/bash", "-c",
 		submit,
 	)
@@ -153,16 +153,16 @@ func (tr *TestRun) submitLegacyUpgradeProposal(action LegacyUpgradeProposalActio
 		log.Fatal(err, "\n", string(bz))
 	}
 
-	tr.waitBlocks(action.chainID, 1, 15*time.Second)
+	tr.waitBlocks(action.ChainID, 1, 15*time.Second)
 }
 
 type waitUntilBlockAction struct {
-	block uint
-	chain chainID
+	Block uint
+	Chain ChainID
 }
 
 func (tr *TestRun) waitUntilBlockOnChain(action waitUntilBlockAction) {
-	fmt.Println("waitUntilBlockOnChain is waiting for block:", action.block)
-	tr.waitUntilBlock(action.chain, action.block, 120*time.Second)
-	fmt.Println("waitUntilBlockOnChain done waiting for block:", action.block)
+	fmt.Println("waitUntilBlockOnChain is waiting for block:", action.Block)
+	tr.waitUntilBlock(action.Chain, action.Block, 120*time.Second)
+	fmt.Println("waitUntilBlockOnChain done waiting for block:", action.Block)
 }