chore: minor cleanup (backport #487) (#490)

Co-authored-by: Gjermund Garaba <gjermund@garaba.net>

Author: mergify[bot]

e2e/interchaintestv8/ibc_eureka_test.go

@@ -393,13 +393,11 @@ func (s *IbcEurekaTestSuite) DeployTest(ctx context.Context, proofType operator.
 		})
 		s.Require().NoError(err)
 
-		// TODO: https://github.com/cosmos/ibc-go/issues/7875
-		// channelResp, err := e2esuite.GRPCQuery[channeltypesv2.QueryChannelResponse](ctx, simd, &channeltypesv2.QueryChannelRequest{
-		// 	ChannelId: ibctesting.FirstChannelID,
-		// })
-		// s.Require().NoError(err)
-		// s.Require().Equal(testvalues.FirstWasmClientID, channelResp.Channel.ClientId)
-		// s.Require().Equal(testvalues.CustomClientID, channelResp.Channel.CounterpartyChannelId)
+		counterpartyInfoResp, err := e2esuite.GRPCQuery[clienttypesv2.QueryCounterpartyInfoResponse](ctx, simd, &clienttypesv2.QueryCounterpartyInfoRequest{
+			ClientId: testvalues.FirstWasmClientID,
+		})
+		s.Require().NoError(err)
+		s.Require().Equal(testvalues.CustomClientID, counterpartyInfoResp.CounterpartyInfo.ClientId)
 	}))
 
 	s.Require().True(s.Run("Verify Cosmos to Eth Relayer Info", func() {

e2e/interchaintestv8/multichain_test.go

@@ -550,13 +550,11 @@ func (s *MultichainTestSuite) TestDeploy_Groth16() {
 		})
 		s.Require().NoError(err)
 
-		// TODO: https://github.com/cosmos/ibc-go/issues/7875
-		// channelResp, err := e2esuite.GRPCQuery[channeltypesv2.QueryChannelResponse](ctx, simdA, &channeltypesv2.QueryChannelRequest{
-		// 	ChannelId: ibctesting.FirstChannelID,
-		// })
-		// s.Require().NoError(err)
-		// s.Require().Equal(testvalues.FirstWasmClientID, channelResp.Channel.ClientId)
-		// s.Require().Equal(testvalues.FirstUniversalClientID, channelResp.Channel.CounterpartyChannelId)
+		counterpartyInfoResp, err := e2esuite.GRPCQuery[clienttypesv2.QueryCounterpartyInfoResponse](ctx, simdA, &clienttypesv2.QueryCounterpartyInfoRequest{
+			ClientId: testvalues.FirstWasmClientID,
+		})
+		s.Require().NoError(err)
+		s.Require().Equal(testvalues.FirstUniversalClientID, counterpartyInfoResp.CounterpartyInfo.ClientId)
 	}))
 
 	s.Require().True(s.Run("Verify ethereum light client for SimdB", func() {
@@ -565,13 +563,11 @@ func (s *MultichainTestSuite) TestDeploy_Groth16() {
 		})
 		s.Require().NoError(err)
 
-		// TODO: https://github.com/cosmos/ibc-go/issues/7875
-		// channelResp, err := e2esuite.GRPCQuery[channeltypesv2.QueryChannelResponse](ctx, simdB, &channeltypesv2.QueryChannelRequest{
-		// 	ChannelId: ibctesting.FirstChannelID,
-		// })
-		// s.Require().NoError(err)
-		// s.Require().Equal(testvalues.FirstWasmClientID, channelResp.Channel.ClientId)
-		// s.Require().Equal(ibctesting.SecondClientID, channelResp.Channel.CounterpartyChannelId)
+		counterpartyInfoResp, err := e2esuite.GRPCQuery[clienttypesv2.QueryCounterpartyInfoResponse](ctx, simdB, &clienttypesv2.QueryCounterpartyInfoRequest{
+			ClientId: testvalues.FirstWasmClientID,
+		})
+		s.Require().NoError(err)
+		s.Require().Equal(testvalues.SecondUniversalClientID, counterpartyInfoResp.CounterpartyInfo.ClientId)
 	}))
 
 	s.Require().True(s.Run("Verify Light Client of Chain A on Chain B", func() {
@@ -1137,9 +1133,6 @@ func (s *MultichainTestSuite) TestTransferEthToCosmosToCosmosAndBack_Groth16() {
 		timeout := uint64(time.Now().Add(30 * time.Minute).Unix())
 
 		transferPayload := transfertypes.FungibleTokenPacketData{
-			// Denom:    denomOnSimdA.IBCDenom(),
-			// BUG: Allowing user to choose the above is a bug in ibc-go
-			// https://github.com/cosmos/ibc-go/issues/7848
 			Denom:    denomOnSimdA.Path(),
 			Amount:   transferAmount.String(),
 			Sender:   simdAUser.FormattedAddress(),

programs/relayer/src/modules/eth_to_cosmos.rs

@@ -199,7 +199,7 @@ impl RelayerService for EthToCosmosRelayerModuleService {
         &self,
         request: Request<api::CreateClientRequest>,
     ) -> Result<Response<api::CreateClientResponse>, tonic::Status> {
-        tracing::info!("Handling relay by tx request for Eth to Cosmos...");
+        tracing::info!("Handling create client request for Eth to Cosmos...");
 
         let inner_req = request.into_inner();
         let tx = self