addressed comments

tests/e2e/actions.go

@@ -2598,10 +2598,9 @@ func (tr Chain) AssignConsumerPubKey(action e2e.AssignConsumerPubKeyAction, verb
 	}
 
 	if !action.ExpectError {
+		// wait for inclusion in a block -> '--broadcast-mode block' is deprecated
 		tr.waitForTx(e2e.ChainID("provi"), bz, 30*time.Second)
 	}
-	// wait for inclusion in a block -> '--broadcast-mode block' is deprecated
-	//tr.waitBlocks(ChainID("provi"), 2, 30*time.Second)
 }
 
 // SlashMeterReplenishmentAction polls the slash meter on provider until value is achieved

tests/e2e/commands.go

@@ -48,6 +48,10 @@ type ValPubKey struct {
 	Value string `yaml:"value"`
 }
 
+func (tr Commands) UseCometMock() bool {
+	return tr.Target.UseCometMock()
+}
+
 func (tr Commands) ExecCommand(name string, arg ...string) *exec.Cmd {
 	return tr.Target.ExecCommand(name, arg...)
 }
@@ -937,10 +941,8 @@ func (tr Commands) GetValidatorIP(chain ChainID, validator ValidatorID) string {
 
 func (tr Commands) GetValidatorNode(chain ChainID, validator ValidatorID) string {
 	// for CometMock, validatorNodes are all the same address as the query node (which is CometMocks address)
-	// TODO: @bermuell Fix this !!!
-	/* 	if tr.useCometmock {
-		return tr.target.GetQueryNode(chain)
+	if tr.UseCometMock() {
+		return tr.GetQueryNode(chain)
 	}
-	*/
 	return "tcp://" + tr.GetValidatorIP(chain, validator) + ":26658"
 }

tests/e2e/main.go

@@ -481,7 +481,7 @@ func createTestConfigs(cfgType TestConfigType, providerVersions, consumerVersion
 // createTestRunners creates test runners to run each test case on each target
 func createTestRunners(testCases []testStepsWithConfig) []TestRunner {
 	runners := []TestRunner{}
-	targetCfg := TargetConfig{useGaia: *useGaia, localSdkPath: *localSdkPath, gaiaTag: *gaiaTag}
+	targetCfg := TargetConfig{useGaia: *useGaia, localSdkPath: *localSdkPath, gaiaTag: *gaiaTag, useCometMock: *useCometmock}
 
 	for _, tc := range testCases {
 		testConfigs := createTestConfigs(tc.config, providerVersions, consumerVersions)

tests/e2e/state.go

@@ -62,6 +62,7 @@ func (tr Chain) waitForTx(chain ChainID, txResponse []byte, timeout time.Duratio
 			log.Printf("query transaction failed with err=%s, resp=%s", err.Error(), res)
 			panic(fmt.Sprintf("\n\nwaitForTx on chain '%s' has timed out after: %s\n\n", chain, timeout))
 		}
+		time.Sleep(1 * time.Second)
 	}
 }
 

tests/e2e/test_target.go

@@ -18,6 +18,7 @@ type ExecutionTarget interface {
 	ExecCommand(name string, arg ...string) *exec.Cmd
 	// ExecDetachedCommand: when executed the command will be run in the background and call will return immediately
 	ExecDetachedCommand(name string, args ...string) *exec.Cmd
+	UseCometMock() bool
 	Start() error
 	Stop() error
 	Build() error
@@ -30,6 +31,7 @@ type TargetConfig struct {
 	useGaia         bool
 	providerVersion string
 	consumerVersion string
+	useCometMock    bool
 }
 type DockerContainer struct {
 	targetConfig TargetConfig
@@ -59,6 +61,10 @@ func createTarget(testCfg TestConfig, targetCfg TargetConfig, image string) (Doc
 	return target, nil
 }
 
+func (dc *DockerContainer) UseCometMock() bool {
+	return dc.targetConfig.useCometMock
+}
+
 func (dc *DockerContainer) GetTargetConfig() TargetConfig {
 	return dc.targetConfig
 }

tests/e2e/testlib/types.go

@@ -157,6 +157,7 @@ type PlatformDriver interface {
 	// ExecDetachedCommand: when executed the command will be run in the background and call will return immediately
 	ExecDetachedCommand(name string, args ...string) *exec.Cmd
 	GetTestScriptPath(isConsumer bool, script string) string
+	UseCometMock() bool
 }
 type TargetDriver interface {
 	// ChainCommands

tests/e2e/v5/commands.go

@@ -56,6 +56,10 @@ type Commands struct {
 	Target           e2e.PlatformDriver
 }
 
+func (tr Commands) UseCometMock() bool {
+	return tr.Target.UseCometMock()
+}
+
 func (tr Commands) ExecCommand(name string, arg ...string) *exec.Cmd {
 	return tr.Target.ExecCommand(name, arg...)
 }
@@ -801,10 +805,8 @@ func (tr Commands) GetQueryNodeRPCAddress(chain ChainID) string {
 
 func (tr Commands) getValidatorNode(chain ChainID, validator ValidatorID) string {
 	// for CometMock, validatorNodes are all the same address as the query node (which is CometMocks address)
-	// TODO: @bermuell Fix this !!!
-	/* 	if tr.useCometmock {
-		return tr.target.GetQueryNode(chain)
+	if tr.UseCometMock() {
+		return tr.GetQueryNode(chain)
 	}
-	*/
 	return "tcp://" + tr.GetValidatorIP(chain, validator) + ":26658"
 }