Improve client error messages

identity-iota/src/chain/integration_chain.rs

@@ -58,20 +58,20 @@ impl IntegrationChain {
     let root_document: IotaDocument = {
       let valid_root_documents: Vec<IotaDocument> = index
         .remove(&MessageId::null())
-        .ok_or(Error::DIDNotFound("DID not found or pruned"))?
+        .ok_or_else(|| Error::DIDNotFound("DID not found or pruned".to_owned()))?
         .into_iter()
         .filter(|doc| IotaDocument::verify_root_document(doc).is_ok())
         .collect();
 
       if valid_root_documents.is_empty() {
-        return Err(Error::DIDNotFound("no valid root document found"));
+        return Err(Error::DIDNotFound("no valid root document found".to_owned()));
       }
 
       let sorted_root_documents: Vec<IotaDocument> = sort_by_milestone(valid_root_documents, client).await?;
       sorted_root_documents
         .into_iter()
         .next()
-        .ok_or(Error::DIDNotFound("no root document confirmed by a milestone found"))?
+        .ok_or_else(|| Error::DIDNotFound("no root document confirmed by a milestone found".to_owned()))?
     };
 
     // Construct the rest of the integration chain.

identity-iota/src/error.rs

@@ -19,8 +19,9 @@ pub enum Error {
   ClientError(#[from] iota_client::error::Error),
   #[error("Invalid Message: {0}")]
   InvalidMessage(#[from] iota_client::bee_message::Error),
+
   #[error("{0}")]
-  DIDNotFound(&'static str),
+  DIDNotFound(String),
   #[error("Invalid Document - Missing Message Id")]
   InvalidDocumentMessageId,
   #[error("Invalid Document - Signing Verification Method Type Not Supported")]
@@ -31,16 +32,6 @@ pub enum Error {
   InvalidRootDocument,
   #[error("Invalid Network Name")]
   InvalidNetworkName,
-  #[error("Invalid Tryte Conversion")]
-  InvalidTryteConversion,
-  #[error("Invalid Transaction Bundle")]
-  InvalidTransactionBundle,
-  #[error("Invalid Transaction Hashes")]
-  InvalidTransactionHashes,
-  #[error("Invalid Transaction Trytes")]
-  InvalidTransactionTrytes,
-  #[error("Invalid Bundle Tail")]
-  InvalidBundleTail,
   #[error("Invalid Presentation Holder")]
   InvalidPresentationHolder,
   #[error("Chain Error: {error}")]
@@ -49,7 +40,7 @@ pub enum Error {
   MissingSigningKey,
   #[error("Cannot Revoke Verification Method")]
   CannotRevokeMethod,
-  #[error("No Client Nodes Provided")]
+  #[error("no client nodes provided for network")]
   NoClientNodesProvided,
   #[error("No Explorer URL Set")]
   NoExplorerURLSet,

identity-iota/src/tangle/client.rs

@@ -18,6 +18,7 @@ use crate::did::IotaDID;
 use crate::document::DiffMessage;
 use crate::document::IotaDocument;
 use crate::error::Error;
+use crate::error::Error::DIDNotFound;
 use crate::error::Result;
 use crate::tangle::ClientBuilder;
 use crate::tangle::DIDMessageEncoding;
@@ -155,9 +156,16 @@ impl Client {
   /// Fetches a [`DocumentChain`] given an [`IotaDID`].
   pub async fn read_document_chain(&self, did: &IotaDID) -> Result<DocumentChain> {
     log::trace!("Read Document Chain: {}", did);
-    log::trace!("Integration Chain Address: {}", did.tag());
+    if self.network != did.network()? {
+      return Err(DIDNotFound(format!(
+        "DID network '{}' does not match client network '{}'",
+        did.network_str(),
+        self.network.name_str()
+      )));
+    }
 
     // Fetch all messages for the integration chain.
+    log::trace!("Integration Chain Address: {}", did.tag());
     let messages: Vec<Message> = self.read_messages(did.tag()).await?;
     let integration_chain: IntegrationChain = IntegrationChain::try_from_messages(did, &messages, self).await?;