f Use From trait for errors

Author: jonasnick

secp256k1-zkp/src/schnorrsig/mod.rs

@@ -46,6 +46,12 @@ impl error::Error for Error {
     }
 }
 
+impl From<schnorrsig_sys::Error> for Error {
+    fn from(err: schnorrsig_sys::Error) -> Self {
+        Error::SysError(err)
+    }
+}
+
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
         match *self {
@@ -87,7 +93,7 @@ impl<C: Verification> Verify for Secp256k1<C> {
         pk: &PublicKey,
     ) -> Result<(), Error> {
         schnorrsig_sys::Verify::schnorrsig_verify(self, msg, sig, pk)
-            .map_err(|e| Error::SysError(e))
+            .map_err(|e| e.into())
     }
     fn schnorrsig_verify_batch(
         &self,
@@ -97,7 +103,7 @@ impl<C: Verification> Verify for Secp256k1<C> {
         pks: &[PublicKey],
     ) -> Result<(), Error> {
         if msgs.len() != sigs.len() || msgs.len() != pks.len() {
-            return Err(Error::SysError(schnorrsig_sys::Error::ArgumentLength));
+            return Err(schnorrsig_sys::Error::ArgumentLength.into());
         }
         let scratch_space = scratch_space.unwrap_or(ScratchSpace::new(self, 8192));
         let n = msgs.len();
@@ -116,13 +122,13 @@ impl<C: Verification> Verify for Secp256k1<C> {
             &sigptrs[..],
             &pkptrs[..],
         )
-        .map_err(|e| Error::SysError(e))
+        .map_err(|e| e.into())
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::{Error, Sign, Signature, SysError, Verify};
+    use super::{Sign, Signature, SysError, Verify};
     use rand::{thread_rng, RngCore};
     use secp256k1::{Message, Secp256k1};
     use secp256k1_zkp_dev::GenerateKeypair;
@@ -146,7 +152,7 @@ mod tests {
             );
             assert_eq!(
                 s.schnorrsig_verify_batch(None, &[msg], &[], &[pk]),
-                Err(Error::SysError(SysError::ArgumentLength))
+                Err(SysError::ArgumentLength.into())
             );
         }
     }