shim,nmt: expunge unwrap

Closes thrumdev#38

Author: pepyakin

sugondat-nmt/src/ns_proof.rs

@@ -38,7 +38,9 @@ impl NamespaceProof {
             if leaf.len() != 68 {
                 return Err(VerifyErr::MalformedLeaf(i));
             }
-            let leaf = NmtLeaf::from_raw_bytes(leaf.as_slice().try_into().unwrap());
+            let leaf = NmtLeaf::from_raw_bytes(
+                leaf.as_slice().try_into().expect("verified to be 68 bytes"),
+            );
             if leaf.blob_hash != blob_hashes[i] {
                 return Err(VerifyErr::BlobHashMismatch(i));
             }

sugondat-shim/src/dock/mod.rs

@@ -8,6 +8,7 @@ use crate::sugondat_rpc;
 
 mod rollkit;
 mod sovereign;
+mod rpc_error;
 
 /// A configuration for initializing all docks.
 pub struct Config {

sugondat-shim/src/dock/rollkit.rs

@@ -2,13 +2,16 @@ use jsonrpsee::Methods;
 use sugondat_shim_common_rollkit::{Blob, JsonRPCError, RollkitRPCServer};
 use tracing::{debug, info};
 
+use super::rpc_error as err;
 use crate::{key::Keypair, sugondat_rpc};
 
 /// Registers the sovereign dock in the given methods.
 pub fn register(methods: &mut Methods, config: &super::Config) {
     debug!("enabling rollkit adapter dock");
     let dock = RollkitDock::new(config.client.clone(), config.submit_key.clone());
-    methods.merge(dock.into_rpc()).unwrap();
+    methods
+        .merge(dock.into_rpc())
+        .expect("adapter namespace must be unique");
 }
 
 struct RollkitDock {
@@ -53,33 +56,13 @@ impl RollkitRPCServer for RollkitDock {
             self.client
                 .submit_blob(blob.data, namespace, submit_key.clone())
                 .await
-                .unwrap();
+                .map_err(|_| err::submission_error())?;
         }
         // TODO:
         Ok(0)
     }
 }
 
-mod err {
-    use sugondat_shim_common_rollkit::JsonRPCError;
-
-    pub fn bad_namespace() -> JsonRPCError {
-        JsonRPCError::owned(
-            jsonrpsee::types::error::INVALID_PARAMS_CODE,
-            "Invalid namespace",
-            None::<()>,
-        )
-    }
-
-    pub fn no_signing_key() -> JsonRPCError {
-        JsonRPCError::owned(
-            jsonrpsee::types::error::INTERNAL_ERROR_CODE,
-            "Internal Error: no key for signing blobs",
-            None::<()>,
-        )
-    }
-}
-
 /// Parses the namespace from a given string encoded as hex.
 ///
 /// Note that rollkit uses arbitrary length namespaces, but sugondat uses 4-byte namespaces. For

sugondat-shim/src/dock/rpc_error.rs

@@ -0,0 +1,25 @@
+use jsonrpsee::types::error::ErrorObjectOwned;
+
+pub fn bad_namespace() -> ErrorObjectOwned {
+    ErrorObjectOwned::owned(
+        jsonrpsee::types::error::INVALID_PARAMS_CODE,
+        "Invalid namespace",
+        None::<()>,
+    )
+}
+
+pub fn no_signing_key() -> ErrorObjectOwned {
+    ErrorObjectOwned::owned(
+        jsonrpsee::types::error::INTERNAL_ERROR_CODE,
+        "Internal Error: no key for signing blobs",
+        None::<()>,
+    )
+}
+
+pub fn submission_error() -> ErrorObjectOwned {
+    ErrorObjectOwned::owned(
+        jsonrpsee::types::error::INTERNAL_ERROR_CODE,
+        "Internal Error: failed to submit blob",
+        None::<()>,
+    )
+}

sugondat-shim/src/dock/sovereign.rs

@@ -2,13 +2,16 @@ use jsonrpsee::{types::ErrorObjectOwned, Methods};
 use sugondat_shim_common_sovereign::{Block, SovereignRPCServer};
 use tracing::{debug, info};
 
+use super::rpc_error as err;
 use crate::{key::Keypair, sugondat_rpc};
 
 /// Registers the sovereign dock in the given methods.
 pub fn register(methods: &mut Methods, config: &super::Config) {
     debug!("enabling sovereign adapter dock");
     let dock = SovereignDock::new(config.client.clone(), config.submit_key.clone());
-    methods.merge(dock.into_rpc()).unwrap();
+    methods
+        .merge(dock.into_rpc())
+        .expect("adapter namespace must be unique");
 }
 
 struct SovereignDock {
@@ -58,22 +61,15 @@ impl SovereignRPCServer for SovereignDock {
         namespace: sugondat_nmt::Namespace,
     ) -> Result<(), ErrorObjectOwned> {
         info!("submit_blob({}, {:?})", blob.len(), namespace);
-
-        let submit_key = match self.submit_key.as_ref() {
-            Some(k) => k.clone(),
-            None => {
-                return Err(ErrorObjectOwned::owned(
-                    jsonrpsee::types::error::INTERNAL_ERROR_CODE,
-                    "Internal Error: no key for signing blobs",
-                    None::<()>,
-                ))
-            }
-        };
-
+        let submit_key = self
+            .submit_key
+            .as_ref()
+            .cloned()
+            .ok_or_else(err::no_signing_key)?;
         self.client
             .submit_blob(blob, namespace, submit_key)
             .await
-            .unwrap();
+            .map_err(|_| err::submission_error())?;
         Ok(())
     }
 }

sugondat-shim/src/sugondat_rpc.rs

@@ -150,22 +150,16 @@ fn extract_blobs(
 }
 
 /// Examines the header and extracts the tree root committed as one of the logs.
+///
+/// Returns None if no tree root was found or if the tree root was malformed.
 fn tree_root(header: &Header) -> Option<sugondat_nmt::TreeRoot> {
-    let mut nmt_root = None;
-    for log in &header.digest.logs {
-        match log {
-            subxt::config::substrate::DigestItem::Other(ref bytes) => {
-                if bytes.starts_with(b"snmt") {
-                    nmt_root = Some(sugondat_nmt::TreeRoot::from_raw_bytes(
-                        bytes[4..].try_into().unwrap(),
-                    ));
-                    break;
-                }
-            }
-            _ => {}
-        }
-    }
-    nmt_root
+    use subxt::config::substrate::DigestItem;
+    let nmt_digest_bytes = header.digest.logs.iter().find_map(|log| match log {
+        DigestItem::Other(ref bytes) if bytes.starts_with(b"snmt") => Some(&bytes[4..]),
+        _ => None,
+    })?;
+    let nmt_root: [u8; 68] = nmt_digest_bytes.try_into().ok()?;
+    Some(sugondat_nmt::TreeRoot::from_raw_bytes(&nmt_root))
 }
 
 mod err {