Merge branch 'main' into semantic-vc-verification

.github/workflows/ci.yml

@@ -52,5 +52,7 @@ jobs:
           cache: true
       - name: Setup
         run: just setup
+      - name: Formatting
+        run: cargo fmt --check
       - name: Lint
         run: just lint

crates/credentials/Cargo.toml

@@ -26,4 +26,5 @@ uuid = { version = "1.8.0", features = ["v4"] }
 [dev-dependencies]
 crypto = { path = "../crypto" }
 serde_canonical_json = "1.0.0"
-tokio = { version = "1.34.0", features = ["macros", "test-util"] }
+tokio = { version = "1.34.0", features = ["macros", "test-util"] }
+test-helpers = { path = "../test-helpers" }

crates/credentials/src/lib.rs

@@ -1,2 +1,2 @@
 pub mod presentation_definition;
-pub mod vc;
+pub mod verifiable_credential;

crates/credentials/src/presentation_definition.rs

@@ -236,47 +236,30 @@ impl JsonSchemaBuilder {
 #[cfg(test)]
 mod tests {
     use std::collections::HashSet;
-    use std::fs;
+
+    use test_helpers::TestVectorFile;
 
     use super::PresentationDefinition;
 
     #[derive(Debug, serde::Deserialize)]
-    struct SelectCredentialsVectorInput {
+    struct VectorInput {
         #[serde(rename = "presentationDefinition")]
         pub presentation_definition: PresentationDefinition,
         #[serde(rename = "credentialJwts")]
         pub credential_jwts: Vec<String>,
     }
 
     #[derive(Debug, serde::Deserialize)]
-    struct SelectCredentialsVectorOutput {
+    struct VectorOutput {
         #[serde(rename = "selectedCredentials")]
         pub selected_credentials: Vec<String>,
     }
 
-    #[derive(Debug, serde::Deserialize)]
-    struct SelectCredentialsVector {
-        pub description: String,
-        pub input: SelectCredentialsVectorInput,
-        pub output: SelectCredentialsVectorOutput,
-    }
-
-    #[derive(Debug, serde::Deserialize)]
-    struct Vectors {
-        pub vectors: Vec<SelectCredentialsVector>,
-    }
-
-    fn load_json_fixture(file_path: &str) -> Vectors {
-        let data = fs::read_to_string(file_path).unwrap();
-        let json = serde_json::from_str(&data).unwrap();
-        json
-    }
-
     #[test]
     fn test_web5_spec_test_vectors() {
-        let json_path =
-            "../../web5-spec/test-vectors/presentation_exchange/select_credentials.json";
-        let vectors = load_json_fixture(json_path);
+        let path = "presentation_exchange/select_credentials.json";
+        let vectors: TestVectorFile<VectorInput, VectorOutput> =
+            TestVectorFile::load_from_path(path);
 
         for vector in vectors.vectors {
             let presentation_definition = vector.input.presentation_definition;

crates/credentials/src/vc.rs → crates/credentials/src/verifiable_credential.rs

@@ -329,7 +329,7 @@ mod test {
     use crypto::Curve;
     use dids::{
         document::VerificationMethodType,
-        method::{
+        methods::{
             jwk::{DidJwk, DidJwkCreateOptions},
             Create,
         },
@@ -339,7 +339,7 @@ mod test {
     use uuid::Uuid;
 
     fn create_bearer_did() -> BearerDid {
-        let key_manager = Arc::new(LocalKeyManager::new_in_memory());
+        let key_manager = Arc::new(LocalKeyManager::new());
         let options = DidJwkCreateOptions {
             curve: Curve::Ed25519,
         };

crates/dids/Cargo.toml

@@ -7,6 +7,7 @@ repository.workspace = true
 license-file.workspace = true
 
 [dependencies]
+byteorder = "1.5.0"
 crypto = { path = "../crypto" }
 did-jwk = "0.1.1"
 did-web = "0.2.2"

crates/dids/src/bearer.rs

@@ -67,7 +67,7 @@ mod test {
     use super::*;
     use crate::{
         document::VerificationMethodType,
-        method::{
+        methods::{
             jwk::{DidJwk, DidJwkCreateOptions},
             Create,
         },
@@ -77,18 +77,18 @@ mod test {
 
     #[tokio::test]
     async fn test_from_key_manager() {
-        let key_manager = Arc::new(LocalKeyManager::new_in_memory());
+        let key_manager = Arc::new(LocalKeyManager::new());
         let options = DidJwkCreateOptions {
             curve: Curve::Ed25519,
         };
         let did_jwk_bearer_did = DidJwk::create(key_manager.clone(), options).unwrap();
         let private_keys = key_manager.export_private_keys().unwrap();
 
         let bearer_did =
-            BearerDid::from_key_manager(&did_jwk_bearer_did.identifier.uri, key_manager)
+            BearerDid::from_key_manager(&did_jwk_bearer_did.identifier.uri, key_manager.clone())
                 .await
                 .unwrap();
-        let bearer_did_private_keys = bearer_did.key_manager.export_private_keys().unwrap();
+        let bearer_did_private_keys = key_manager.export_private_keys().unwrap();
 
         assert_eq!(bearer_did.identifier.uri, did_jwk_bearer_did.identifier.uri);
         assert_eq!(private_keys.len(), bearer_did_private_keys.len());
@@ -100,7 +100,7 @@ mod test {
 
     #[test]
     fn test_sign() {
-        let key_manager = Arc::new(LocalKeyManager::new_in_memory());
+        let key_manager = Arc::new(LocalKeyManager::new());
         let options = DidJwkCreateOptions {
             curve: Curve::Ed25519,
         };

crates/dids/src/lib.rs

@@ -1,5 +1,5 @@
 pub mod bearer;
 pub mod document;
 pub mod identifier;
-pub mod method;
+pub mod methods;
 pub mod resolver;