wip

Author: Mr-Leshiy

rust/signed_doc/Cargo.toml

@@ -29,7 +29,6 @@ jsonpath-rust = "0.7.5"
 [dev-dependencies]
 base64-url = "3.0.0"
 rand = "0.8.5"
-tokio = "1.42.0"
 
 
 [[bin]]

rust/signed_doc/src/lib.rs

@@ -12,7 +12,6 @@ pub mod validator;
 use std::{
     convert::TryFrom,
     fmt::{Display, Formatter},
-    future::Future,
     sync::Arc,
 };
 
@@ -142,11 +141,8 @@ impl CatalystSignedDocument {
     /// # Errors
     ///
     /// Returns a report of verification failures and the source error.
-    pub async fn verify<P, T>(&self, pk_getter: P) -> Result<(), CatalystSignedDocError>
-    where
-        P: Fn(&IdUri) -> T,
-        T: Future<Output = Option<VerifyingKey>>,
-    {
+    pub fn verify<P>(&self, pk_getter: P) -> Result<(), CatalystSignedDocError>
+    where P: Fn(&IdUri) -> Option<VerifyingKey> {
         let report = ProblemReport::new("Catalyst Signed Document Verification");
 
         let cose_sign = match self.as_cose_sign() {
@@ -161,7 +157,7 @@ impl CatalystSignedDocument {
         };
 
         for (signature, kid) in self.signatures().cose_signatures_with_kids() {
-            match pk_getter(kid).await {
+            match pk_getter(kid) {
                 Some(pk) => {
                     let tbs_data = cose_sign.tbs_data(&[], signature);
                     match signature.signature.as_slice().try_into() {
@@ -408,8 +404,8 @@ mod tests {
         assert_eq!(decoded.doc_meta(), metadata.extra());
     }
 
-    #[tokio::test]
-    async fn signature_verification_test() {
+    #[test]
+    fn signature_verification_test() {
         let mut csprng = OsRng;
         let sk: SigningKey = SigningKey::generate(&mut csprng);
         let content = serde_json::to_vec(&serde_json::Value::Null).unwrap();
@@ -430,8 +426,8 @@ mod tests {
             .build()
             .unwrap();
 
-        assert!(signed_doc.verify(|_| async { Some(pk) }).await.is_ok());
+        assert!(signed_doc.verify(|_| Some(pk)).is_ok());
 
-        assert!(signed_doc.verify(|_| async { None }).await.is_err());
+        assert!(signed_doc.verify(|_| None).is_err());
     }
 }

rust/signed_doc/src/validator/mod.rs

@@ -16,6 +16,22 @@ pub(crate) type StatelessRule = fn(&CatalystSignedDocument, &ProblemReport) -> b
 pub(crate) type StatefullRule<DocType, DocProvider> =
     fn(&DocType, &DocProvider, &ProblemReport) -> bool;
 
+/// Trait for defining a stateless validation rules.
+pub trait StatelessValidation
+where Self: 'static
+{
+    /// Stateless validation rules
+    const STATELESS_RULES: &[StatelessRule];
+
+    /// Perform a stateless validation, collecting a problem report
+    fn validate(doc: &CatalystSignedDocument, report: &ProblemReport) -> bool {
+        Self::STATELESS_RULES
+            .iter()
+            .map(|rule| rule(doc, report))
+            .all(|res| res)
+    }
+}
+
 /// Trait for defining a statefull validation rules.
 pub trait StatefullValidation<DocProvider>
 where
@@ -34,22 +50,6 @@ where
     }
 }
 
-/// Trait for defining a stateless validation rules.
-pub trait StatelessValidation
-where Self: 'static
-{
-    /// Stateless validation rules
-    const STATELESS_RULES: &[StatelessRule];
-
-    /// Perform a stateless validation, collecting a problem report
-    fn validate(doc: &CatalystSignedDocument, report: &ProblemReport) -> bool {
-        Self::STATELESS_RULES
-            .iter()
-            .map(|rule| rule(doc, report))
-            .all(|res| res)
-    }
-}
-
 /// A comprehensive validation of the `CatalystSignedDocument`,
 /// including a signature verification and document type based validation.
 ///