fix merge conflict

cosmos · Jan 17, 2024 · 07d4e30 · 07d4e30
2 parents 1ce3a93 + 4027158
commit 07d4e30
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go
@@ -745,9 +745,9 @@ func (tr TestConfig) addChainToGorelayer(
 	}
 
 	chainConfig := fmt.Sprintf(gorelayerChainConfigTemplate,
-		accountPrefix,
 		ChainId,
 		rpcAddr,
+		accountPrefix,
 	)
 
 	//#nosec G204 -- Bypass linter warning for spawning subprocess with cmd arguments.

diff --git a/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json b/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json
@@ -107,10 +107,10 @@
         "Rewards": null,
         "ConsumerChains": null,
         "AssignedKeys": {
-          "alice": "consumervalcons1muys5jyqk4xd27e208nym85kn0t4zjcfk9q5ce"
+          "alice": "cosmosvalcons1muys5jyqk4xd27e208nym85kn0t4zjcfeu63fe"
         },
         "ProviderKeys": {
-          "alice": "consumervalcons1qmq08eruchr5sf5s3rwz7djpr5a25f7xpvpagq"
+          "alice": "cosmosvalcons1qmq08eruchr5sf5s3rwz7djpr5a25f7xw4mceq"
         },
         "ConsumerPendingPacketQueueSize": null,
         "RegisteredConsumerRewardDenoms": null,

diff --git a/tests/e2e/tracehandler_testdata/happyPath.json b/tests/e2e/tracehandler_testdata/happyPath.json
@@ -471,7 +471,7 @@
         "Rewards": null,
         "ConsumerChains": null,
         "AssignedKeys": {
-          "bob": "consumervalcons1uuec3cjxajv5te08p220usrjhkfhg9wyref26m",
+          "bob": "cosmosvalcons1uuec3cjxajv5te08p220usrjhkfhg9wyvqn0tm",
           "carol": "cosmosvalcons1kswr5sq599365kcjmhgufevfps9njf43e4lwdk"
         },
         "ProviderKeys": {
@@ -526,7 +526,7 @@
         "Rewards": null,
         "ConsumerChains": null,
         "AssignedKeys": {
-          "bob": "consumervalcons1uuec3cjxajv5te08p220usrjhkfhg9wyref26m",
+          "bob": "cosmosvalcons1uuec3cjxajv5te08p220usrjhkfhg9wyvqn0tm",
           "carol": "cosmosvalcons1kswr5sq599365kcjmhgufevfps9njf43e4lwdk"
         },
         "ProviderKeys": {