Make ProofSuite object-safe

spruceid · Mar 30, 2021 · a48f106 · a48f106
1 parent fb67099
commit a48f106
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 103 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Make `jws::sign_bytes` return bytes instead of string.
 - Allow multiple proofs and multiple verification methods in a DID document
 - Added `Source::KeyAndPattern` enum variant.
+- Made `ProofSuite` object-safe.
 
 ### Fixed
 - Fix `tz1` hashing.

diff --git a/did-ethr/src/lib.rs b/did-ethr/src/lib.rs
@@ -279,13 +279,10 @@ mod tests {
         let mut vc_wrong_key = vc_no_proof.clone();
         let other_key = JWK::generate_ed25519().unwrap();
         use ssi::ldp::ProofSuite;
-        let proof_bad = ssi::ldp::Ed25519BLAKE2BDigestSize20Base58CheckEncodedSignature2021::sign(
-            &vc_no_proof,
-            &issue_options,
-            &other_key,
-        )
-        .await
-        .unwrap();
+        let proof_bad = ssi::ldp::Ed25519BLAKE2BDigestSize20Base58CheckEncodedSignature2021
+            .sign(&vc_no_proof, &issue_options, &other_key)
+            .await
+            .unwrap();
         vc_wrong_key.add_proof(proof_bad);
         vc_wrong_key.validate().unwrap();
         assert!(vc_wrong_key.verify(None, &DIDEthr).await.errors.len() > 0);

diff --git a/did-sol/src/lib.rs b/did-sol/src/lib.rs
@@ -261,13 +261,10 @@ mod tests {
         let mut vc_wrong_key = vc_no_proof.clone();
         let other_key = JWK::generate_ed25519().unwrap();
         use ssi::ldp::ProofSuite;
-        let proof_bad = ssi::ldp::Ed25519BLAKE2BDigestSize20Base58CheckEncodedSignature2021::sign(
-            &vc_no_proof,
-            &issue_options,
-            &other_key,
-        )
-        .await
-        .unwrap();
+        let proof_bad = ssi::ldp::Ed25519BLAKE2BDigestSize20Base58CheckEncodedSignature2021
+            .sign(&vc_no_proof, &issue_options, &other_key)
+            .await
+            .unwrap();
         vc_wrong_key.add_proof(proof_bad);
         vc_wrong_key.validate().unwrap();
         assert!(vc_wrong_key.verify(None, &DIDSol).await.errors.len() > 0);

diff --git a/did-tezos/src/lib.rs b/did-tezos/src/lib.rs
@@ -721,13 +721,10 @@ mod tests {
         let mut vc_wrong_key = vc_no_proof.clone();
         let other_key = JWK::generate_ed25519().unwrap();
         use ssi::ldp::ProofSuite;
-        let proof_bad = ssi::ldp::Ed25519BLAKE2BDigestSize20Base58CheckEncodedSignature2021::sign(
-            &vc_no_proof,
-            &issue_options,
-            &other_key,
-        )
-        .await
-        .unwrap();
+        let proof_bad = ssi::ldp::Ed25519BLAKE2BDigestSize20Base58CheckEncodedSignature2021
+            .sign(&vc_no_proof, &issue_options, &other_key)
+            .await
+            .unwrap();
         vc_wrong_key.add_proof(proof_bad);
         vc_wrong_key.validate().unwrap();
         assert!(vc_wrong_key.verify(None, &DIDTZ).await.errors.len() > 0);
@@ -891,13 +888,10 @@ mod tests {
         let mut vc_wrong_key = vc_no_proof.clone();
         let other_key = JWK::generate_ed25519().unwrap();
         use ssi::ldp::ProofSuite;
-        let proof_bad = ssi::ldp::Ed25519BLAKE2BDigestSize20Base58CheckEncodedSignature2021::sign(
-            &vc_no_proof,
-            &issue_options,
-            &other_key,
-        )
-        .await
-        .unwrap();
+        let proof_bad = ssi::ldp::Ed25519BLAKE2BDigestSize20Base58CheckEncodedSignature2021
+            .sign(&vc_no_proof, &issue_options, &other_key)
+            .await
+            .unwrap();
         vc_wrong_key.add_proof(proof_bad);
         vc_wrong_key.validate().unwrap();
         assert!(vc_wrong_key.verify(None, &DIDTZ).await.errors.len() > 0);
@@ -1282,13 +1276,10 @@ mod tests {
         let mut vc_wrong_key = vc_no_proof.clone();
         let other_key = JWK::generate_p256().unwrap();
         use ssi::ldp::ProofSuite;
-        let proof_bad = ssi::ldp::P256BLAKE2BDigestSize20Base58CheckEncodedSignature2021::sign(
-            &vc_no_proof,
-            &issue_options,
-            &other_key,
-        )
-        .await
-        .unwrap();
+        let proof_bad = ssi::ldp::P256BLAKE2BDigestSize20Base58CheckEncodedSignature2021
+            .sign(&vc_no_proof, &issue_options, &other_key)
+            .await
+            .unwrap();
         vc_wrong_key.add_proof(proof_bad);
         vc_wrong_key.validate().unwrap();
         assert!(vc_wrong_key.verify(None, &DIDTZ).await.errors.len() > 0);