Add signing verification to wycheproof

Before this patch, only signature verification was being tested

tests/wycheproof_eddsa.rs

@@ -6,28 +6,32 @@ mod wycheproof {
     use wycheproof::wycheproof::*;
 
     use core::convert::TryFrom;
-    use salty::{PublicKey, Signature};
-    use salty::constants::{PUBLICKEY_SERIALIZED_LENGTH, SIGNATURE_SERIALIZED_LENGTH};
+    use salty::constants::{
+        PUBLICKEY_SERIALIZED_LENGTH, SECRETKEY_SERIALIZED_LENGTH, SIGNATURE_SERIALIZED_LENGTH,
+    };
+    use salty::{Keypair, PublicKey, SecretKey, Signature};
 
     #[test_wycheproof("tests/eddsa_test.json", "eddsa_verify_schema.json")]
     fn eddsa_test_case(test_key: &Key, test_data: &SignatureTestVector) {
+        let pk = <[u8; PUBLICKEY_SERIALIZED_LENGTH]>::try_from(test_key.pk)
+            .map(|arr| PublicKey::try_from(&arr));
+        let sk = <[u8; SECRETKEY_SERIALIZED_LENGTH]>::try_from(test_key.sk)
+            .map(|arr| SecretKey::from(&arr));
+        let expected_sig = <[u8; SIGNATURE_SERIALIZED_LENGTH]>::try_from(test_data.sig)
+            .map(|arr| Signature::from(&arr));
 
-        let pk  = <[u8; PUBLICKEY_SERIALIZED_LENGTH]>::try_from(test_key.pk);
-        let sig = <[u8; SIGNATURE_SERIALIZED_LENGTH]>::try_from(test_data.sig);
-        let valid: bool;
-
-        if pk.is_err() || sig.is_err() {
-            valid = false;
-        } else {
-            let pk  = PublicKey::try_from(&pk.unwrap());
-            if pk.is_err() {
-                valid = false;
-            } else {
-                let sig = Signature::from(&sig.unwrap());
-                let result = pk.unwrap().verify(&test_data.msg, &sig);
-                valid = result.is_ok();
+        let valid = match (pk, sk, expected_sig) {
+            (Ok(Ok(pk)), Ok(sk), Ok(expected_sig)) => {
+                let result = pk.verify(&test_data.msg, &expected_sig);
+                let kp = Keypair {
+                    secret: sk,
+                    public: pk,
+                };
+                let sig = kp.sign(&test_data.msg);
+                result.is_ok() && sig.to_bytes() == test_data.sig
             }
-        }
+            _ => false,
+        };
 
         match test_data.result {
             ExpectedResult::Valid => assert!(valid),
@@ -38,7 +42,7 @@ mod wycheproof {
                 } else {
                     assert!(!valid)
                 }
-            },
+            }
             ExpectedResult::Acceptable => assert!(true),
         }
     }