test(dataset): proper vc parsing case

contracts/okp4-dataverse/src/credential/proof.rs

@@ -8,13 +8,11 @@ use itertools::Itertools;
 use okp4_rdf::dataset::{Dataset, QuadIterator};
 use rio_api::model::{GraphName, Literal, Term};
 
-#[allow(dead_code)]
 #[derive(Debug, PartialEq)]
 pub enum Proof<'a> {
     Ed25519Signature2020(Ed25519Signature2020Proof<'a>),
 }
 
-#[allow(dead_code)]
 impl<'a> Proof<'a> {
     pub fn suitable(&self, issuer: &str, purpose: ProofPurpose) -> bool {
         match self {
@@ -189,7 +187,6 @@ impl<'a> TryFrom<(&'a Dataset<'a>, GraphName<'a>)> for Proof<'a> {
     }
 }
 
-#[allow(dead_code)]
 #[derive(Debug, PartialEq)]
 pub struct Ed25519Signature2020Proof<'a> {
     verification_method: Ed25519VerificationKey2020<'a>,
@@ -218,7 +215,6 @@ impl<'a> TryFrom<(&'a Dataset<'a>, GraphName<'a>)> for Ed25519Signature2020Proof
     }
 }
 
-#[allow(dead_code)]
 #[derive(Debug, PartialEq)]
 pub struct Ed25519VerificationKey2020<'a> {
     id: &'a str,
@@ -286,29 +282,10 @@ mod multiformats {
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::testutil::testutil;
     use base64::prelude::BASE64_STANDARD;
     use base64::Engine;
-    use okp4_rdf::serde::NQuadsReader;
     use rio_api::model::BlankNode;
-    use std::env;
-    use std::fs::File;
-    use std::io::{BufReader, Read};
-    use std::path::Path;
-
-    fn read_test_data(file: &str) -> Vec<u8> {
-        let mut bytes: Vec<u8> = Vec::new();
-
-        File::open(
-            Path::new(&env::var("CARGO_MANIFEST_DIR").unwrap())
-                .join("testdata")
-                .join(file),
-        )
-        .unwrap()
-        .read_to_end(&mut bytes)
-        .unwrap();
-
-        bytes
-    }
 
     #[test]
     fn proof_from_dataset() {
@@ -365,10 +342,7 @@ mod test {
         ];
 
         for (test_file, expected) in cases {
-            let raw_rdf = read_test_data(test_file);
-            let buffer = BufReader::new(raw_rdf.as_slice());
-            let mut reader = NQuadsReader::new(buffer);
-            let owned_quads = reader.read_all().unwrap();
+            let owned_quads = testutil::read_test_quads(test_file);
             let dataset = Dataset::from(owned_quads.as_slice());
 
             let proof_res =

contracts/okp4-dataverse/src/credential/vc.rs

@@ -2,11 +2,10 @@ use crate::credential::error::{InvalidCredentialError, InvalidProofError, Verifi
 use crate::credential::proof::{Proof, ProofPurpose};
 use crate::credential::rdf_marker::*;
 use itertools::Itertools;
-use okp4_rdf::dataset::Dataset;
 use okp4_rdf::dataset::QuadIterator;
+use okp4_rdf::dataset::{Dataset, QuadPattern};
 use rio_api::model::{BlankNode, Literal, NamedNode, Subject, Term};
 
-#[allow(dead_code)]
 #[derive(Debug, PartialEq)]
 pub struct VerifiableCredential<'a> {
     id: &'a str,
@@ -20,14 +19,12 @@ pub struct VerifiableCredential<'a> {
     unsecured_document: Dataset<'a>,
 }
 
-#[allow(dead_code)]
 #[derive(Debug, PartialEq)]
 pub struct Claim<'a> {
     id: &'a str,
     content: Dataset<'a>,
 }
 
-#[allow(dead_code)]
 #[derive(Debug, PartialEq)]
 pub struct Status<'a> {
     id: &'a str,
@@ -48,11 +45,13 @@ impl<'a> TryFrom<&'a Dataset<'a>> for VerifiableCredential<'a> {
             return Err(InvalidCredentialError::MissingProof);
         }
 
-        let unsecured_filter = proof_graphs
+        let mut unsecured_filter: Vec<QuadPattern<'_>> = proof_graphs
             .into_iter()
             .map(|g| (None, None, None, Some(Some(g.into()))).into())
             .collect();
 
+        unsecured_filter.push((Some(id.into()), Some(VC_RDF_PROOF), None, None).into());
+
         Ok(Self {
             id: id.iri,
             types: Self::extract_types(dataset, id)?,
@@ -296,57 +295,39 @@ impl<'a> VerifiableCredential<'a> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use okp4_rdf::serde::NQuadsReader;
-    use rio_api::model::Quad;
+    use crate::testutil::testutil;
 
     #[test]
-    fn mescouilles() {
-        let vc_raw = r#"<did:key:z6MkqxFfjh6HNFuNSGmqVDJxL4fcdbcBco7CNHBLjEo125wu> <https://schema.org/name> "Hometown Theatres, Inc." .
-<did:v1:test:nym:z6MkhYBppZa2aD5xitZg3FbWLYPupRMAEecKFLQvmoYw8yEa> <https://schema.org/owns> _:b2 .
-<https://vcplayground.org/credential/RK55U9YAbe28e_lDGcMnd> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://contexts.vcplayground.org/examples/movie-ticket/vocab#MovieTicketCredential> .
-<https://vcplayground.org/credential/RK55U9YAbe28e_lDGcMnd> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://www.w3.org/2018/credentials#VerifiableCredential> .
-<https://vcplayground.org/credential/RK55U9YAbe28e_lDGcMnd> <https://schema.org/description> "Admit one: Plan 9 from Outer Space, 3pm showing." .
-<https://vcplayground.org/credential/RK55U9YAbe28e_lDGcMnd> <https://schema.org/image> <data:image/png;base64,iVBORw0KGgoA> .
-<https://vcplayground.org/credential/RK55U9YAbe28e_lDGcMnd> <https://w3id.org/security#proof> _:b0 .
-<https://vcplayground.org/credential/RK55U9YAbe28e_lDGcMnd> <https://www.w3.org/2018/credentials#credentialSubject> <did:v1:test:nym:z6MkhYBppZa2aD5xitZg3FbWLYPupRMAEecKFLQvmoYw8yEa> .
-<https://vcplayground.org/credential/RK55U9YAbe28e_lDGcMnd> <https://www.w3.org/2018/credentials#issuanceDate> "2023-11-29T10:07:56.079Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
-<https://vcplayground.org/credential/RK55U9YAbe28e_lDGcMnd> <https://www.w3.org/2018/credentials#issuer> <did:key:z6MkqxFfjh6HNFuNSGmqVDJxL4fcdbcBco7CNHBLjEo125wu> .
-_:b1 <http://purl.org/dc/terms/created> "2023-11-29T10:07:56Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> _:b0 .
-_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://w3id.org/security#Ed25519Signature2020> _:b0 .
-_:b1 <https://w3id.org/security#proofPurpose> <https://w3id.org/security#assertionMethod> _:b0 .
-_:b1 <https://w3id.org/security#proofValue> "z5UT4w3v6uSJ3srR3ZFSZBbgjaMRyEUaaGdnZzEb2oc1YTskkpff9qYt2GiTDuU2wqEh3f99YvWubPuqVNWrn9hNx"^^<https://w3id.org/security#multibase> _:b0 .
-_:b1 <https://w3id.org/security#verificationMethod> <did:key:z6MkqxFfjh6HNFuNSGmqVDJxL4fcdbcBco7CNHBLjEo125wu#z6MkqxFfjh6HNFuNSGmqVDJxL4fcdbcBco7CNHBLjEo125wu> _:b0 .
-_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://schema.org/Ticket> .
-_:b2 <https://schema.org/location> _:b3 .
-_:b2 <https://schema.org/startDate> "2022-08-26T19:00:00.000Z" .
-_:b2 <https://schema.org/ticketNumber> "457812" .
-_:b2 <https://schema.org/ticketToken> "urn:1a1e549a-2867" .
-_:b2 <https://schema.org/ticketedSeat> _:b5 .
-_:b3 <https://schema.org/PostalAddress> _:b4 .
-_:b3 <https://schema.org/name> "Hometown Theatres, Inc." .
-_:b4 <https://schema.org/addressLocality> "Your Town" .
-_:b4 <https://schema.org/addressRegion> "VA" .
-_:b4 <https://schema.org/postalCode> "24060" .
-_:b4 <https://schema.org/streetAddress> "123 Main St." .
-_:b5 <https://schema.org/seatNumber> "11" .
-_:b5 <https://schema.org/seatRow> "E" .
-_:b5 <https://schema.org/seatSection> "Theatre 3" ."#;
-
-        let mut reader = NQuadsReader::new(vc_raw.as_bytes());
-        let owned_quads = reader.read_all().unwrap();
-        let quads: Vec<Quad<'_>> = owned_quads.iter().map(Quad::from).collect();
-        let dataset = Dataset::new(quads);
+    fn proper_vc_from_dataset() {
+        let owned_quads = testutil::read_test_quads("vc-ok-unsecured.nq");
+        let unsecure_dataset = Dataset::from(owned_quads.as_slice());
 
-        let vc = VerifiableCredential::try_from(&dataset);
+        let owned_quads = testutil::read_test_quads("vc-ok.nq");
+        let dataset = Dataset::from(owned_quads.as_slice());
 
-        assert!(vc.is_ok());
-        let vc = vc.unwrap();
+        let vc_res = VerifiableCredential::try_from(&dataset);
+        assert!(vc_res.is_ok());
+        let vc = vc_res.unwrap();
+        assert_eq!(vc.id, "http://example.edu/credentials/58473");
         assert_eq!(
-            vc.id,
-            "https://vcplayground.org/credential/RK55U9YAbe28e_lDGcMnd"
+            vc.types,
+            vec!["https://www.w3.org/2018/credentials#VerifiableCredential"]
         );
-
-        let verif = vc.verify();
-        assert!(verif.is_ok());
+        assert_eq!(
+            vc.issuer,
+            "did:key:z6MkpwdnLPAm4apwcrRYQ6fZ3rAcqjLZR4AMk14vimfnozqY"
+        );
+        assert_eq!(vc.issuance_date, "2023-05-01T06:09:10Z");
+        assert_eq!(vc.expiration_date, None);
+        assert_eq!(
+            vc.claims,
+            vec![Claim {
+                id: "did:key:z6MkpwdnLPAm4apwcrRYQ6fZ3rAcqjLZR4AMk14vimfnozqY",
+                content: Dataset::new(vec![]),
+            }]
+        );
+        assert_eq!(vc.status, None);
+        assert_eq!(vc.proof.len(), 1usize);
+        assert_eq!(vc.unsecured_document, unsecure_dataset);
     }
 }

contracts/okp4-dataverse/src/lib.rs

@@ -15,5 +15,6 @@ mod credential;
 mod error;
 pub mod msg;
 pub mod state;
+mod testutil;
 
 pub use crate::error::ContractError;

contracts/okp4-dataverse/src/testutil.rs

@@ -0,0 +1,31 @@
+#[cfg(test)]
+pub mod testutil {
+    use okp4_rdf::owned_model::OwnedQuad;
+    use okp4_rdf::serde::NQuadsReader;
+    use std::env;
+    use std::fs::File;
+    use std::io::{BufReader, Read};
+    use std::path::Path;
+
+    pub fn read_test_quads(file: &str) -> Vec<OwnedQuad> {
+        let raw_rdf = read_test_data(file);
+        let buffer = BufReader::new(raw_rdf.as_slice());
+        let mut reader = NQuadsReader::new(buffer);
+        reader.read_all().unwrap()
+    }
+
+    pub fn read_test_data(file: &str) -> Vec<u8> {
+        let mut bytes: Vec<u8> = Vec::new();
+
+        File::open(
+            Path::new(&env::var("CARGO_MANIFEST_DIR").unwrap())
+                .join("testdata")
+                .join(file),
+        )
+        .unwrap()
+        .read_to_end(&mut bytes)
+        .unwrap();
+
+        bytes
+    }
+}

contracts/okp4-dataverse/testdata/vc-ok-unsecured.nq

@@ -0,0 +1,4 @@
+<http://example.edu/credentials/58473> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://www.w3.org/2018/credentials#VerifiableCredential> .
+<http://example.edu/credentials/58473> <https://www.w3.org/2018/credentials#credentialSubject> <did:key:z6MkpwdnLPAm4apwcrRYQ6fZ3rAcqjLZR4AMk14vimfnozqY> .
+<http://example.edu/credentials/58473> <https://www.w3.org/2018/credentials#issuanceDate> "2023-05-01T06:09:10Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+<http://example.edu/credentials/58473> <https://www.w3.org/2018/credentials#issuer> <did:key:z6MkpwdnLPAm4apwcrRYQ6fZ3rAcqjLZR4AMk14vimfnozqY> .

contracts/okp4-dataverse/testdata/vc-ok.nq

@@ -0,0 +1,10 @@
+<http://example.edu/credentials/58473> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://www.w3.org/2018/credentials#VerifiableCredential> .
+<http://example.edu/credentials/58473> <https://w3id.org/security#proof> _:b0 .
+<http://example.edu/credentials/58473> <https://www.w3.org/2018/credentials#credentialSubject> <did:key:z6MkpwdnLPAm4apwcrRYQ6fZ3rAcqjLZR4AMk14vimfnozqY> .
+<http://example.edu/credentials/58473> <https://www.w3.org/2018/credentials#issuanceDate> "2023-05-01T06:09:10Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+<http://example.edu/credentials/58473> <https://www.w3.org/2018/credentials#issuer> <did:key:z6MkpwdnLPAm4apwcrRYQ6fZ3rAcqjLZR4AMk14vimfnozqY> .
+_:b1 <http://purl.org/dc/terms/created> "2024-02-01T17:46:53.676947Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> _:b0 .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <https://w3id.org/security#Ed25519Signature2020> _:b0 .
+_:b1 <https://w3id.org/security#proofPurpose> <https://w3id.org/security#assertionMethod> _:b0 .
+_:b1 <https://w3id.org/security#proofValue> "z3WboEDRwsWokH8vQrveVWbg6fQnqhHfhrkGHT9tyG2GYgzQVZ9zFW6eK2ZNcnGhydqXWDwwTsZq29e7cHJkbnVkF"^^<https://w3id.org/security#multibase> _:b0 .
+_:b1 <https://w3id.org/security#verificationMethod> <did:key:z6MkpwdnLPAm4apwcrRYQ6fZ3rAcqjLZR4AMk14vimfnozqY#z6MkpwdnLPAm4apwcrRYQ6fZ3rAcqjLZR4AMk14vimfnozqY> _:b0 .

packages/okp4-rdf/src/lib.rs

@@ -1,5 +1,5 @@
 pub mod dataset;
 pub mod normalize;
-mod owned_model;
+pub mod owned_model;
 pub mod serde;
 pub mod uri;