Fix didpeer test, fix did:peer:2 regex validation

Signed-off-by: Patrik Stas <[email protected]>

Author: Patrik-Stas

did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/encoding.rs

@@ -136,14 +136,13 @@ mod tests {
         verification_method::{VerificationMethod, VerificationMethodType},
     };
     use did_parser::DidUrl;
-    use did_resolver::traits::resolvable::resolution_output::DidResolutionOutput;
     use pretty_assertions::assert_eq;
 
     use super::*;
     use crate::{
         helpers::convert_to_hashmap,
         peer_did::{numalgos::numalgo2::Numalgo2, PeerDid},
-        resolver::{options::PublicKeyEncoding, PeerDidResolver},
+        resolver::{options::PublicKeyEncoding},
     };
 
     fn create_verification_method(
@@ -197,7 +196,7 @@ mod tests {
             .routing_keys(vec![ServiceKeyKind::Reference(
                 "did:example:somemediator#somekey".parse().unwrap(),
             )])
-            .accept(vec!["didcomm/aip2;env=rfc587".into()])
+            .accept(vec!["didcomm/v2".into(), "didcomm/aip2;env=rfc587".into()])
             .build();
 
         let service = Service::new(
@@ -214,17 +213,14 @@ mod tests {
         let did = append_encoded_service_segment(did.to_string(), &did_document).unwrap();
 
         let did_parsed = PeerDid::<Numalgo2>::parse(did.clone()).unwrap();
-        let DidResolutionOutput { did_document, .. } =
-            PeerDidResolver::resolve_peerdid2(&did_parsed, PublicKeyEncoding::Base58)
-                .await
-                .unwrap();
+        let ddo = did_parsed.to_did_doc(PublicKeyEncoding::Base58).unwrap();
 
         let did_expected_parsed = PeerDid::<Numalgo2>::parse(did_expected.clone()).unwrap();
         let ddo_expected = did_expected_parsed
             .to_did_doc(PublicKeyEncoding::Base58)
             .unwrap();
 
-        assert_eq!(did_document, ddo_expected);
+        assert_eq!(ddo, ddo_expected);
         assert_eq!(did, did_expected);
     }
 

did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/mod.rs

@@ -55,6 +55,7 @@ impl Numalgo for Numalgo2 {
 mod test {
     use did_doc::schema::did_doc::DidDocument;
     use serde_json::{from_value, json};
+    use pretty_assertions::assert_eq;
 
     use crate::{
         peer_did::{numalgos::numalgo2::Numalgo2, PeerDid},

did_core/did_methods/did_peer/src/peer_did/validate.rs

@@ -6,7 +6,7 @@ use crate::error::DidPeerError;
 
 static GROUP_NUMALGO_0_AND_1: &str = r"([01](z)([1-9a-km-zA-HJ-NP-Z]{5,200}))";
 static GROUP_NUMALGO_2: &str =
-    r"(2((.[AEVID](z)([1-9a-km-zA-HJ-NP-Z]{5,200}))+(.(S)[0-9a-zA-Z=]*)?))";
+    r"(2((.[AEVID](z)([1-9a-km-zA-HJ-NP-Z]{5,200}))*(.(S)[0-9a-zA-Z=]*)?))";
 static GROUP_NUMALGO_3: &str = r"(3\.[0-9a-fA-F]{64})";
 
 pub static PEER_DID_REGEX: Lazy<Regex> = Lazy::new(|| {