More clean up

ibc-apps/ics20-transfer/src/module.rs

@@ -133,15 +133,15 @@ pub fn on_chan_close_init_validate(
     _port_id: &PortId,
     _channel_id: &ChannelId,
 ) -> Result<(), TokenTransferError> {
-    Err(TokenTransferError::UnsupportedClosedChannel)
+    Err(TokenTransferError::InvalidClosedChannel)
 }
 
 pub fn on_chan_close_init_execute(
     _ctx: &mut impl TokenTransferExecutionContext,
     _port_id: &PortId,
     _channel_id: &ChannelId,
 ) -> Result<ModuleExtras, TokenTransferError> {
-    Err(TokenTransferError::UnsupportedClosedChannel)
+    Err(TokenTransferError::InvalidClosedChannel)
 }
 
 pub fn on_chan_close_confirm_validate(

ibc-apps/ics20-transfer/types/src/error.rs

@@ -9,11 +9,11 @@ use ibc_core::primitives::prelude::*;
 
 #[derive(Display, Debug, derive_more::From)]
 pub enum TokenTransferError {
-    /// host error: `{0}`
+    /// host error: {0}
     Host(HostError),
-    /// decoding error: `{0}`
+    /// decoding error: {0}
     Decoding(DecodingError),
-    /// channel error: `{0}`
+    /// channel error: {0}
     Channel(ChannelError),
     /// missing destination channel `{channel_id}` on port `{port_id}`
     MissingDestinationChannel {
@@ -24,8 +24,8 @@ pub enum TokenTransferError {
     MismatchedChannelOrders { expected: Order, actual: Order },
     /// mismatched port IDs: expected `{expected}`, actual `{actual}`
     MismatchedPortIds { expected: PortId, actual: PortId },
-    /// channel cannot be closed
-    UnsupportedClosedChannel,
+    /// invalid channel state: cannot be closed
+    InvalidClosedChannel,
     /// failed to deserialize packet data
     FailedToDeserializePacketData,
     /// failed to deserialize acknowledgement

ibc-apps/ics721-nft-transfer/src/module.rs

@@ -132,15 +132,15 @@ pub fn on_chan_close_init_validate(
     _port_id: &PortId,
     _channel_id: &ChannelId,
 ) -> Result<(), NftTransferError> {
-    Err(NftTransferError::UnsupportedClosedChannel)
+    Err(NftTransferError::InvalidClosedChannel)
 }
 
 pub fn on_chan_close_init_execute(
     _ctx: &mut impl NftTransferExecutionContext,
     _port_id: &PortId,
     _channel_id: &ChannelId,
 ) -> Result<ModuleExtras, NftTransferError> {
-    Err(NftTransferError::UnsupportedClosedChannel)
+    Err(NftTransferError::InvalidClosedChannel)
 }
 
 pub fn on_chan_close_confirm_validate(

ibc-apps/ics721-nft-transfer/types/src/error.rs

@@ -10,19 +10,19 @@ use ibc_core::primitives::prelude::*;
 
 #[derive(Display, Debug, From)]
 pub enum NftTransferError {
-    /// host error: `{0}`
+    /// host error: {0}
     Host(HostError),
-    /// channel error: `{0}`
+    /// channel error: {0}
     Channel(ChannelError),
-    /// decoding error: `{0}`
+    /// decoding error: {0}
     Decoding(DecodingError),
     /// missing destination channel `{channel_id}` on port `{port_id}`
     MissingDestinationChannel {
         port_id: PortId,
         channel_id: ChannelId,
     },
-    /// empty token ID
-    EmptyTokenId,
+    /// missing token ID
+    MissingTokenId,
     /// mismatched number of token IDs: expected `{expected}`, actual `{actual}`
     MismatchedNumberOfTokenIds { expected: usize, actual: usize },
     /// mismatched channel orders: expected `{expected}`, actual `{actual}`
@@ -35,8 +35,8 @@ pub enum NftTransferError {
     FailedToDeserializeAck,
     /// failed to parse account ID
     FailedToParseAccount,
-    /// channel cannot be closed
-    UnsupportedClosedChannel,
+    /// invalid channel state: cannot be closed
+    InvalidClosedChannel,
 }
 
 #[cfg(feature = "std")]

ibc-apps/ics721-nft-transfer/types/src/packet.rs

@@ -92,7 +92,7 @@ impl PacketData {
     /// Performs the basic validation of the packet data fields.
     pub fn validate_basic(&self) -> Result<(), NftTransferError> {
         if self.token_ids.0.is_empty() {
-            return Err(NftTransferError::EmptyTokenId);
+            return Err(NftTransferError::MissingTokenId);
         }
         let num = self.token_ids.0.len();
         let num_uri = self

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

@@ -342,7 +342,7 @@ where
         let tm_consensus_state_timestamp = tm_consensus_state.timestamp();
         let tm_consensus_state_expiry = (tm_consensus_state_timestamp
             + client_state.trusting_period)
-            .map_err(|_| TimestampError::TimestampOverflow)?;
+            .map_err(|_| TimestampError::OverflowedTimestamp)?;
 
         if tm_consensus_state_expiry > host_timestamp {
             break;