fix: remove unnecessary map_err(PacketError::Channel)

ibc-clients/ics07-tendermint/src/client_state/common.rs

@@ -162,7 +162,7 @@ pub fn verify_consensus_state(
     let tm_consensus_state = TmConsensusState::try_from(consensus_state)?;
 
     if tm_consensus_state.root().is_empty() {
-        return Err(CommitmentError::EmptyCommitmentRoot)?;
+        Err(CommitmentError::EmptyCommitmentRoot)?;
     };
 
     if consensus_state_status(&tm_consensus_state, host_timestamp, trusting_period)?.is_expired() {
@@ -297,7 +297,7 @@ pub fn verify_membership<H: HostFunctionsProvider>(
     value: Vec<u8>,
 ) -> Result<(), ClientError> {
     if prefix.is_empty() {
-        return Err(CommitmentError::EmptyCommitmentPrefix)?;
+        Err(CommitmentError::EmptyCommitmentPrefix)?;
     }
 
     let merkle_path = MerklePath::new(vec![prefix.as_bytes().to_vec().into(), path]);

ibc-core/ics04-channel/src/handler/acknowledgement.rs

@@ -201,8 +201,7 @@ where
                 Path::Ack(ack_path_on_b),
                 ack_commitment.into_vec(),
             )
-            .map_err(ChannelError::FailedProofVerification)
-            .map_err(PacketError::Channel)?;
+            .map_err(ChannelError::FailedProofVerification)?;
     }
 
     Ok(())

ibc-core/ics04-channel/src/handler/recv_packet.rs

@@ -221,8 +221,7 @@ where
                 Path::Commitment(commitment_path_on_a),
                 expected_commitment_on_a.into_vec(),
             )
-            .map_err(ChannelError::FailedProofVerification)
-            .map_err(PacketError::Channel)?;
+            .map_err(ChannelError::FailedProofVerification)?;
     }
 
     match chan_end_on_b.ordering {

ibc-core/ics04-channel/src/handler/timeout.rs

@@ -254,12 +254,10 @@ where
             }
         };
 
-        next_seq_recv_verification_result
-            .map_err(|e| ChannelError::FailedPacketVerification {
-                sequence: msg.next_seq_recv_on_b,
-                client_error: e,
-            })
-            .map_err(PacketError::Channel)?;
+        next_seq_recv_verification_result.map_err(|e| ChannelError::FailedPacketVerification {
+            sequence: msg.next_seq_recv_on_b,
+            client_error: e,
+        })?;
     }
 
     Ok(())

ibc-core/ics04-channel/src/handler/timeout_on_close.rs

@@ -116,8 +116,7 @@ where
                 Path::ChannelEnd(chan_end_path_on_b),
                 expected_chan_end_on_b.encode_vec(),
             )
-            .map_err(ChannelError::FailedProofVerification)
-            .map_err(PacketError::Channel)?;
+            .map_err(ChannelError::FailedProofVerification)?;
 
         verify_conn_delay_passed(ctx_a, msg.proof_height_on_b, &conn_end_on_a)?;
 
@@ -163,12 +162,10 @@ where
             }
         };
 
-        next_seq_recv_verification_result
-            .map_err(|e| ChannelError::FailedPacketVerification {
-                sequence: msg.next_seq_recv_on_b,
-                client_error: e,
-            })
-            .map_err(PacketError::Channel)?;
+        next_seq_recv_verification_result.map_err(|e| ChannelError::FailedPacketVerification {
+            sequence: msg.next_seq_recv_on_b,
+            client_error: e,
+        })?;
     };
 
     Ok(())

ibc-testkit/src/testapp/ibc/core/core_ctx.rs

@@ -137,7 +137,7 @@ where
         Ok(self
             .conn_counter
             .get(StoreHeight::Pending, &NextConnectionSequencePath)
-            .ok_or(ConnectionError::MissingHostHeight)?)
+            .ok_or(ConnectionError::MissingConnectionCounter)?)
     }
 
     fn channel_end(&self, channel_end_path: &ChannelEndPath) -> Result<ChannelEnd, ContextError> {