From 86110f1a60eaf72e019f551818760ccfe77d78f3 Mon Sep 17 00:00:00 2001 From: chunningham Date: Mon, 17 Oct 2022 15:20:50 +0200 Subject: [PATCH 1/2] ensure/pick relationship before choosing suite --- ssi-ldp/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssi-ldp/src/lib.rs b/ssi-ldp/src/lib.rs index b8f9d30a2..00b49b815 100644 --- a/ssi-ldp/src/lib.rs +++ b/ssi-ldp/src/lib.rs @@ -469,6 +469,8 @@ impl LinkedDataProofs { key: &JWK, extra_proof_properties: Option>, ) -> Result { + let mut options = options.clone(); + ensure_or_pick_verification_relationship(&mut options, document, key, resolver).await?; // Use type property if present let suite = if let Some(ref type_) = options.type_ { get_proof_suite(type_)? @@ -477,8 +479,6 @@ impl LinkedDataProofs { else { pick_proof_suite(key, options.verification_method.as_ref())? }; - let mut options = options.clone(); - ensure_or_pick_verification_relationship(&mut options, document, key, resolver).await?; suite .sign( document, From 3b18fec3b6a814bfc4a1b0e22cace55975d23aa6 Mon Sep 17 00:00:00 2001 From: chunningham Date: Mon, 17 Oct 2022 17:05:58 +0200 Subject: [PATCH 2/2] also move in `prepare` --- ssi-ldp/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ssi-ldp/src/lib.rs b/ssi-ldp/src/lib.rs index 00b49b815..dee9ebd73 100644 --- a/ssi-ldp/src/lib.rs +++ b/ssi-ldp/src/lib.rs @@ -501,6 +501,9 @@ impl LinkedDataProofs { public_key: &JWK, extra_proof_properties: Option>, ) -> Result { + let mut options = options.clone(); + ensure_or_pick_verification_relationship(&mut options, document, public_key, resolver) + .await?; // Use type property if present let suite = if let Some(ref type_) = options.type_ { get_proof_suite(type_)? @@ -509,9 +512,6 @@ impl LinkedDataProofs { else { pick_proof_suite(public_key, options.verification_method.as_ref())? }; - let mut options = options.clone(); - ensure_or_pick_verification_relationship(&mut options, document, public_key, resolver) - .await?; suite .prepare( document,