Clean up ibc-core and ibc-clients error types

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

@@ -8,7 +8,7 @@
 //! Rust). As such, this module also includes some trait implementations that
 //! serve to pass through traits implemented on the wrapped `ClientState` type.
 
-use ibc_client_tendermint_types::error::Error;
+use ibc_client_tendermint_types::error::TendermintClientError;
 use ibc_client_tendermint_types::proto::v1::ClientState as RawTmClientState;
 use ibc_client_tendermint_types::ClientState as ClientStateType;
 use ibc_core_client::types::error::ClientError;
@@ -44,7 +44,7 @@ impl ClientState {
 impl Protobuf<RawTmClientState> for ClientState {}
 
 impl TryFrom<RawTmClientState> for ClientState {
-    type Error = Error;
+    type Error = TendermintClientError;
 
     fn try_from(raw: RawTmClientState) -> Result<Self, Self::Error> {
         Ok(Self(ClientStateType::try_from(raw)?))

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

@@ -67,7 +67,7 @@
         let (upgrade_path_prefix, upgrade_path) = match upgrade_path.len() {
             0 => {
                 return Err(UpgradeClientError::InvalidUpgradePath {
-                    reason: "no upgrade path has been set".to_string(),
+                    description: "no upgrade path has been set".to_string(),
                 }
                 .into());
             }
@@ -78,7 +78,7 @@
             ),
             _ => {
                 return Err(UpgradeClientError::InvalidUpgradePath {
-                    reason: "upgrade path is too long".to_string(),
+                    description: "upgrade path is too long".to_string(),
                 }
                 .into());
             }
@@ -162,15 +162,11 @@
     let tm_consensus_state = TmConsensusState::try_from(consensus_state)?;
 
     if tm_consensus_state.root().is_empty() {
-        return Err(ClientError::Other {
-            description: "empty commitment root".into(),
-        });
+        Err(CommitmentError::EmptyCommitmentRoot)?;
     };
 
     if consensus_state_status(&tm_consensus_state, host_timestamp, trusting_period)?.is_expired() {
-        return Err(ClientError::ClientNotActive {
-            status: Status::Expired,
-        });
+        return Err(ClientError::InvalidStatus(Status::Expired));
     }
 
     Ok(())
@@ -214,8 +210,8 @@
 
     if latest_height < proof_height {
         return Err(ClientError::InvalidProofHeight {
-            latest_height,
-            proof_height,
+            actual: latest_height,
+            expected: proof_height,
         });
     }
 
@@ -258,7 +254,7 @@
     // the upgrade height This condition checks both the revision number and
     // the height
     if latest_height >= upgraded_tm_client_state_height {
-        Err(UpgradeClientError::LowUpgradeHeight {
+        Err(UpgradeClientError::InsufficientUpgradeHeight {
             upgraded_height: upgraded_tm_client_state_height,
             client_height: latest_height,
         })?
@@ -301,17 +297,16 @@
     value: Vec<u8>,
 ) -> Result<(), ClientError> {
     if prefix.is_empty() {
-        return Err(ClientError::Ics23Verification(
-            CommitmentError::EmptyCommitmentPrefix,
-        ));
+        Err(CommitmentError::EmptyCommitmentPrefix)?;
     }
 
     let merkle_path = MerklePath::new(vec![prefix.as_bytes().to_vec().into(), path]);
-    let merkle_proof = MerkleProof::try_from(proof).map_err(ClientError::InvalidCommitmentProof)?;
 
-    merkle_proof
-        .verify_membership::<H>(proof_specs, root.clone().into(), merkle_path, value, 0)
-        .map_err(ClientError::Ics23Verification)
+    let merkle_proof = MerkleProof::try_from(proof)?;
+
+    merkle_proof.verify_membership::<H>(proof_specs, root.clone().into(), merkle_path, value, 0)?;
+
+    Ok(())
 }
 
 /// Verify that the given value does not belong in the client's merkle proof.
@@ -327,9 +322,10 @@
     path: PathBytes,
 ) -> Result<(), ClientError> {
     let merkle_path = MerklePath::new(vec![prefix.as_bytes().to_vec().into(), path]);
-    let merkle_proof = MerkleProof::try_from(proof).map_err(ClientError::InvalidCommitmentProof)?;
 
-    merkle_proof
-        .verify_non_membership::<H>(proof_specs, root.clone().into(), merkle_path)
-        .map_err(ClientError::Ics23Verification)
+    let merkle_proof = MerkleProof::try_from(proof)?;
+
+    merkle_proof.verify_non_membership::<H>(proof_specs, root.clone().into(), merkle_path)?;
+
+    Ok(())
 }

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

@@ -1,4 +1,4 @@
-use ibc_client_tendermint_types::error::{Error, IntoResult};
+use ibc_client_tendermint_types::error::{IntoResult, TendermintClientError};
 use ibc_client_tendermint_types::{
     ConsensusState as ConsensusStateType, Header as TmHeader, Misbehaviour as TmMisbehaviour,
 };
@@ -101,14 +101,11 @@
 
         let duration_since_consensus_state =
             current_timestamp.duration_since(&trusted_timestamp).ok_or(
-                ClientError::InvalidConsensusStateTimestamp {
-                    time1: trusted_timestamp,
-                    time2: current_timestamp,
-                },
+                ClientError::InvalidConsensusStateTimestamp(trusted_timestamp),
             )?;
 
         if duration_since_consensus_state >= options.trusting_period {
-            return Err(Error::ConsensusStateTimestampGteTrustingPeriod {
+            return Err(TendermintClientError::InsufficientTrustingPeriod {
                 duration_since_consensus_state,
                 trusting_period: options.trusting_period,
             }

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

@@ -1,4 +1,4 @@
-use ibc_client_tendermint_types::error::{Error, IntoResult};
+use ibc_client_tendermint_types::error::{IntoResult, TendermintClientError};
 use ibc_client_tendermint_types::{ConsensusState as ConsensusStateType, Header as TmHeader};
 use ibc_core_client::context::{Convertible, ExtClientValidationContext};
 use ibc_core_client::types::error::ClientError;
@@ -63,10 +63,10 @@
                     .trusted_height
                     .revision_height()
                     .try_into()
-                    .map_err(|_| ClientError::ClientSpecific {
-                        description: Error::InvalidHeaderHeight {
-                            height: header.trusted_height.revision_height(),
-                        }
+                    .map_err(|_| ClientError::FailedHeaderVerification {
+                        description: TendermintClientError::InvalidHeaderHeight(
+                            header.trusted_height.revision_height(),
+                        )
                         .to_string(),
                     })?,
                 next_validators: &header.trusted_next_validator_set,

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

@@ -278,5 +278,5 @@
         && subject_proof_specs == &substitute_proof_specs
         && subject_upgrade_path == &substitute_upgrade_path)
         .then_some(())
-        .ok_or(ClientError::ClientRecoveryStateMismatch)
+        .ok_or(ClientError::MismatchedClientRecoveryStates)
 }

ibc-clients/ics07-tendermint/src/consensus_state.rs

@@ -6,7 +6,7 @@
 //! implementations that serve to pass through traits implemented on the wrapped
 //! `ConsensusState` type.
 
-use ibc_client_tendermint_types::error::Error;
+use ibc_client_tendermint_types::error::TendermintClientError;
 use ibc_client_tendermint_types::proto::v1::ConsensusState as RawTmConsensusState;
 use ibc_client_tendermint_types::ConsensusState as ConsensusStateType;
 use ibc_core_client::context::consensus_state::ConsensusState as ConsensusStateTrait;
@@ -52,7 +52,7 @@ impl From<ConsensusState> for ConsensusStateType {
 impl Protobuf<RawTmConsensusState> for ConsensusState {}
 
 impl TryFrom<RawTmConsensusState> for ConsensusState {
-    type Error = Error;
+    type Error = TendermintClientError;
 
     fn try_from(raw: RawTmConsensusState) -> Result<Self, Self::Error> {
         Ok(Self(ConsensusStateType::try_from(raw)?))