Skip to content

Commit 33e34cd

Browse files
Patrik-StasPatrik-Stas
committed
wip
Signed-off-by: Patrik Stas <[email protected]>
1 parent 40b8dbf commit 33e34cd

File tree

20 files changed

+114
-116
lines changed

20 files changed

+114
-116
lines changed

‎aries/aries_vcx/src/protocols/did_exchange/state_machine/helpers.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -244,20 +244,17 @@ mod tests {
244244
service_endpoint.into(),
245245
ExtraFieldsDidCommV1::builder()
246246
.set_routing_keys(routing_keys.into_iter().map(SovKeyKind::Value).collect())
247-
.set_recipient_keys(vec![SovKeyKind::DidKey(key_enc.clone().try_into().unwrap())])
247+
.set_recipient_keys(vec![SovKeyKind::DidKey(
248+
key_enc.clone().try_into().unwrap(),
249+
)])
248250
.build(),
249251
)
250252
.try_into()
251253
.unwrap();
252254

253255
let did = Did::default();
254256

255-
let result = did_doc_from_keys(
256-
did,
257-
key_ver,
258-
key_enc,
259-
service,
260-
);
257+
let result = did_doc_from_keys(did, key_ver, key_enc, service);
261258

262259
assert!(result.is_ok());
263260
let did_doc = result.unwrap();

‎aries/aries_vcx/tests/test_did_exchange.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
extern crate log;
22

3-
use std::error::Error;
4-
use std::sync::Arc;
3+
use std::{error::Error, sync::Arc};
54

65
use aries_vcx::protocols::did_exchange::{
76
resolve_enc_key_from_invitation,
@@ -40,14 +39,14 @@ async fn did_exchange_test() -> Result<(), Box<dyn Error>> {
4039
let agent_inviter = create_test_agent_trustee(setup.genesis_file_path.clone()).await;
4140
let agent_invitee = create_test_agent(setup.genesis_file_path.clone()).await;
4241

43-
let (ledger_read_2, _) =
44-
dev_build_profile_vdr_ledger(setup.genesis_file_path);
42+
let (ledger_read_2, _) = dev_build_profile_vdr_ledger(setup.genesis_file_path);
4543
let ledger_read_2_arc = Arc::new(ledger_read_2);
4644

4745
// if we were to use, more generally, the `dev_build_featured_indy_ledger`, we would need to
4846
// here the type based on the feature flag (indy vs proxy vdr client) which is pain
4947
// we need to improve DidSovResolver such that Rust compiler can fully infer the return type
50-
let did_sov_resolver: DidSovResolver<Arc<DefaultIndyLedgerRead>, DefaultIndyLedgerRead> = DidSovResolver::new(ledger_read_2_arc);
48+
let did_sov_resolver: DidSovResolver<Arc<DefaultIndyLedgerRead>, DefaultIndyLedgerRead> =
49+
DidSovResolver::new(ledger_read_2_arc);
5150

5251
let resolver_registry = Arc::new(
5352
ResolverRegistry::new()

‎did_core/did_doc/src/schema/did_doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ mod tests {
313313
let service = ServiceBuilder::new(
314314
service_id,
315315
service_endpoint.try_into().unwrap(),
316-
HashMap::default()
316+
HashMap::default(),
317317
)
318318
.add_service_type(service_type)
319319
.unwrap()

‎did_core/did_doc_sov/src/service/didcommv2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub struct ServiceDidCommV2 {
6060
//
6161
// fn try_from(service: Service<HashMap<String, Value>>) -> Result<Self, Self::Error> {
6262
// let extra =
63-
//
63+
//
6464
// serde_json::from_value::<ExtraFieldsDidCommV2>(serde_json::to_value(service.extra())?)?;
6565
// Self::new(
6666
// service.id().clone(),

‎did_core/did_doc_sov/tests/serde.rs

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
use did_doc::schema::did_doc::DidDocument;
2-
use did_doc_sov::{
3-
service::ServiceType,
4-
};
2+
use did_doc_sov::service::ServiceType;
53

64
const DID_DOC_SOV_EXTRAS: &str = r#"
75
{
@@ -82,14 +80,20 @@ fn test_deserialization() {
8280
first_service.service_endpoint().to_string(),
8381
"https://example.com/endpoint"
8482
);
85-
assert_eq!(first_service.service_type().first().unwrap(), ServiceType::AIP1.to_string());
83+
assert_eq!(
84+
first_service.service_type().first().unwrap(),
85+
ServiceType::AIP1.to_string()
86+
);
8687

8788
let second_service = services.get(1).unwrap();
8889
assert_eq!(
8990
second_service.id().to_string(),
9091
"did:sov:HR6vs6GEZ8rHaVgjg2WodM#did-communication"
9192
);
92-
assert_eq!(second_service.service_type().first().unwrap(), ServiceType::DIDCommV1.to_string());
93+
assert_eq!(
94+
second_service.service_type().first().unwrap(),
95+
ServiceType::DIDCommV1.to_string()
96+
);
9397
assert_eq!(
9498
second_service.service_endpoint().to_string(),
9599
"https://example.com/endpoint"
@@ -100,7 +104,10 @@ fn test_deserialization() {
100104
third_service.id().to_string(),
101105
"did:sov:HR6vs6GEZ8rHaVgjg2WodM#didcomm-1"
102106
);
103-
assert_eq!(third_service.service_type().first().unwrap(), ServiceType::DIDCommV2.to_string());
107+
assert_eq!(
108+
third_service.service_type().first().unwrap(),
109+
ServiceType::DIDCommV2.to_string()
110+
);
104111
assert_eq!(
105112
third_service.service_endpoint().to_string(),
106113
"https://example.com/endpoint"

‎did_core/did_doc_sov/tests/serde_legacy.rs

+14-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use did_doc::schema::did_doc::DidDocument;
2-
use did_doc_sov::{extra_fields::SovKeyKind};
2+
use did_doc_sov::extra_fields::SovKeyKind;
33

44
const LEGACY_DID_DOC_JSON: &str = r#"
55
{
@@ -72,7 +72,12 @@ fn test_deserialization_legacy() {
7272
"http://localhost:8080/agency/msg"
7373
);
7474

75-
let recipient_key = match service.extra_field_as_as::<Vec<SovKeyKind>>("recipient_keys").unwrap().first().unwrap() {
75+
let recipient_key = match service
76+
.extra_field_as_as::<Vec<SovKeyKind>>("recipient_keys")
77+
.unwrap()
78+
.first()
79+
.unwrap()
80+
{
7681
SovKeyKind::Reference(did_url) => did_doc
7782
.dereference_key(did_url)
7883
.unwrap()
@@ -83,5 +88,11 @@ fn test_deserialization_legacy() {
8388
};
8489
assert_eq!(recipient_key, VERKEY_BASE58);
8590
assert_eq!(service.extra_field_as_as::<u32>("priority").unwrap(), 0);
86-
assert_eq!(service.extra_field_as_as::<Vec<String>>("routing_keys").unwrap().len(), 2);
91+
assert_eq!(
92+
service
93+
.extra_field_as_as::<Vec<String>>("routing_keys")
94+
.unwrap()
95+
.len(),
96+
2
97+
);
8798
}

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ mod tests {
185185
service::Service,
186186
verification_method::{VerificationMethod, VerificationMethodType},
187187
};
188-
use did_doc_sov::extra_fields::{convert_to_hashmap, didcommv2::ExtraFieldsDidCommV2, SovKeyKind};
188+
use did_doc_sov::extra_fields::{
189+
convert_to_hashmap, didcommv2::ExtraFieldsDidCommV2, SovKeyKind,
190+
};
189191
use did_parser::DidUrl;
190192

191193
use super::*;
@@ -252,7 +254,7 @@ mod tests {
252254
let service = Service::builder(
253255
did_full.parse().unwrap(),
254256
"https://example.com/endpoint".parse().unwrap(),
255-
convert_to_hashmap(&extra).unwrap()
257+
convert_to_hashmap(&extra).unwrap(),
256258
)
257259
.add_service_type("DIDCommMessaging".to_string())
258260
.unwrap()

‎did_core/did_methods/did_peer/src/peer_did/numalgos/numalgo2/resolve/helpers.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,9 @@ mod tests {
311311
"https://example.com/endpoint2".to_string()
312312
);
313313
assert_eq!(
314-
second_service.extra_field_as_as::<Vec<SovAcceptType>>("accept").unwrap(),
314+
second_service
315+
.extra_field_as_as::<Vec<SovAcceptType>>("accept")
316+
.unwrap(),
315317
vec![
316318
SovAcceptType::DIDCommV2,
317319
SovAcceptType::Other("didcomm/aip2;env=rfc587".to_string())
@@ -381,9 +383,9 @@ mod tests {
381383
// );
382384
// assert_eq!(service.id().to_string(), "#didcommmessaging-0");
383385
//
384-
// // todo: why is this supposed to build AIP1 if the service specifies type DIDCommMessaging?
385-
// // should probably return error in runtime upon deserialization
386-
// assert!(matches!(service.extra(), ExtraFieldsSov::AIP1(_)));
386+
// // todo: why is this supposed to build AIP1 if the service specifies type
387+
// DIDCommMessaging? // should probably return error in runtime upon
388+
// deserialization assert!(matches!(service.extra(), ExtraFieldsSov::AIP1(_)));
387389
// }
388390

389391
// todo: patrik: restore?

‎did_core/did_methods/did_peer/src/resolver/mod.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use async_trait::async_trait;
2-
use serde::{Deserialize, Serialize};
32
use did_parser::Did;
43
use did_resolver::{
54
error::GenericError,
65
traits::resolvable::{
7-
resolution_metadata::DidResolutionMetadata,
8-
resolution_output::DidResolutionOutput, DidResolvable,
6+
resolution_metadata::DidResolutionMetadata, resolution_output::DidResolutionOutput,
7+
DidResolvable,
98
},
109
};
10+
use serde::{Deserialize, Serialize};
1111

1212
use crate::{
1313
error::DidPeerError,
@@ -45,9 +45,12 @@ impl DidResolvable for PeerDidResolver {
4545
let peer_did = AnyPeerDid::parse(did.to_owned())?;
4646
match peer_did {
4747
AnyPeerDid::Numalgo2(peer_did) => {
48-
let did_doc = resolve_numalgo2(peer_did.did(), options.encoding.unwrap_or(PublicKeyEncoding::Multibase))?
49-
.add_also_known_as(peer_did.to_numalgo3()?.to_string().parse()?)
50-
.build();
48+
let did_doc = resolve_numalgo2(
49+
peer_did.did(),
50+
options.encoding.unwrap_or(PublicKeyEncoding::Multibase),
51+
)?
52+
.add_also_known_as(peer_did.to_numalgo3()?.to_string().parse()?)
53+
.build();
5154
let resolution_metadata = DidResolutionMetadata::builder()
5255
.content_type("application/did+json".to_string())
5356
.build();

‎did_core/did_methods/did_peer/tests/demo.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
use std::collections::HashMap;
2-
use std::error::Error;
1+
use std::{collections::HashMap, error::Error};
32

43
use did_doc::schema::{
54
did_doc::DidDocument,

‎did_core/did_methods/did_peer/tests/resolve_negative.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@ mod fixtures;
22

33
use did_peer::{
44
error::DidPeerError,
5-
resolver::{
6-
options::PublicKeyEncoding,
7-
PeerDidResolver,
8-
},
5+
resolver::{options::PublicKeyEncoding, PeerDidResolutionOptions, PeerDidResolver},
96
};
107
use did_resolver::traits::resolvable::DidResolvable;
118
use tokio::test;
12-
use did_peer::resolver::PeerDidResolutionOptions;
139

1410
async fn resolve_error(peer_did: &str) -> DidPeerError {
15-
let options = PeerDidResolutionOptions { encoding: Some(PublicKeyEncoding::Multibase) };
11+
let options = PeerDidResolutionOptions {
12+
encoding: Some(PublicKeyEncoding::Multibase),
13+
};
1614
*PeerDidResolver
1715
.resolve(&peer_did.parse().unwrap(), &options)
1816
.await

‎did_core/did_methods/did_peer/tests/resolve_positive.rs

+25-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mod fixtures;
22

33
use did_doc::schema::did_doc::DidDocument;
4-
use did_peer::resolver::{options::{PublicKeyEncoding}, PeerDidResolutionOptions, PeerDidResolver};
4+
use did_peer::resolver::{options::PublicKeyEncoding, PeerDidResolutionOptions, PeerDidResolver};
55
use did_resolver::traits::resolvable::DidResolvable;
66
use tokio::test;
77

@@ -24,24 +24,42 @@ async fn resolve_positive_test(did_doc: &str, peer_did: &str, options: PeerDidRe
2424

2525
#[test]
2626
async fn test_resolve_numalgo2_basic() {
27-
let options = PeerDidResolutionOptions { encoding: Some(PublicKeyEncoding::Base58) };
27+
let options = PeerDidResolutionOptions {
28+
encoding: Some(PublicKeyEncoding::Base58),
29+
};
2830
resolve_positive_test(DID_DOC_BASIC, PEER_DID_NUMALGO_2_BASIC, options).await;
2931
}
3032

3133
#[test]
3234
async fn test_resolve_numalgo2_multiple_services() {
33-
let options = PeerDidResolutionOptions { encoding: Some(PublicKeyEncoding::Multibase) };
34-
resolve_positive_test(DID_DOC_MULTIPLE_SERVICES, PEER_DID_NUMALGO_2_MULTIPLE_SERVICES, options).await;
35+
let options = PeerDidResolutionOptions {
36+
encoding: Some(PublicKeyEncoding::Multibase),
37+
};
38+
resolve_positive_test(
39+
DID_DOC_MULTIPLE_SERVICES,
40+
PEER_DID_NUMALGO_2_MULTIPLE_SERVICES,
41+
options,
42+
)
43+
.await;
3544
}
3645

3746
#[test]
3847
async fn test_resolve_numalgo2_no_routing_keys() {
39-
let options = PeerDidResolutionOptions { encoding: Some(PublicKeyEncoding::Multibase) };
40-
resolve_positive_test(DID_DOC_NO_ROUTING_KEYS, PEER_DID_NUMALGO_2_NO_ROUTING_KEYS, options).await;
48+
let options = PeerDidResolutionOptions {
49+
encoding: Some(PublicKeyEncoding::Multibase),
50+
};
51+
resolve_positive_test(
52+
DID_DOC_NO_ROUTING_KEYS,
53+
PEER_DID_NUMALGO_2_NO_ROUTING_KEYS,
54+
options,
55+
)
56+
.await;
4157
}
4258

4359
#[test]
4460
async fn test_resolve_numalgo2_no_services() {
45-
let options = PeerDidResolutionOptions { encoding: Some(PublicKeyEncoding::Multibase) };
61+
let options = PeerDidResolutionOptions {
62+
encoding: Some(PublicKeyEncoding::Multibase),
63+
};
4664
resolve_positive_test(DID_DOC_NO_SERVICES, PEER_DID_NUMALGO_2_NO_SERVICES, options).await;
4765
}

‎did_core/did_methods/did_resolver_sov/src/dereferencing/dereferencer.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use did_resolver::{
99
dereferencing_options::DidDereferencingOptions,
1010
dereferencing_output::DidDereferencingOutput, DidDereferenceable,
1111
},
12-
resolvable::{DidResolvable},
12+
resolvable::DidResolvable,
1313
},
1414
};
1515

@@ -29,9 +29,7 @@ where
2929
did_url: &DidUrl,
3030
_options: &DidDereferencingOptions,
3131
) -> Result<DidDereferencingOutput<Self::Output>, GenericError> {
32-
let resolution_output = self
33-
.resolve(&did_url.try_into()?, &())
34-
.await?;
32+
let resolution_output = self.resolve(&did_url.try_into()?, &()).await?;
3533

3634
dereference_did_document(&resolution_output, did_url).map_err(|err| err.into())
3735
}

‎did_core/did_methods/did_resolver_sov/src/resolution/resolver.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ use async_trait::async_trait;
44
use did_resolver::{
55
did_parser::Did,
66
error::GenericError,
7-
traits::resolvable::{
8-
resolution_output::DidResolutionOutput,
9-
DidResolvable,
10-
},
7+
traits::resolvable::{resolution_output::DidResolutionOutput, DidResolvable},
118
};
129
use serde_json::Value;
1310

@@ -53,7 +50,7 @@ where
5350
async fn resolve(
5451
&self,
5552
parsed_did: &Did,
56-
_options: &Self::DidResolutionOptions
53+
_options: &Self::DidResolutionOptions,
5754
) -> Result<DidResolutionOutput, GenericError> {
5855
let method = parsed_did.method().ok_or_else(|| {
5956
DidSovError::InvalidDid("Attempted to resolve unqualified did".to_string())

‎did_core/did_methods/did_resolver_sov/src/resolution/utils.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,7 @@ mod tests {
184184
}
185185
}"#;
186186
let verkey = "9wvq2i4xUa5umXoThe83CDgx1e5bsjZKJL4DEWvTP9qe".to_string();
187-
let resolution_output = ledger_response_to_ddo(did, resp, verkey)
188-
.await
189-
.unwrap();
187+
let resolution_output = ledger_response_to_ddo(did, resp, verkey).await.unwrap();
190188
let ddo = resolution_output.did_document();
191189
assert_eq!(ddo.id().to_string(), "did:example:1234567890");
192190
assert_eq!(ddo.service()[0].id().to_string(), "did:example:1234567890");

‎did_core/did_methods/did_resolver_sov/tests/resolution.rs

+3-12
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ use aries_vcx::common::ledger::{
55
transactions::write_endpoint,
66
};
77
use aries_vcx_core::{ledger::base_ledger::IndyLedgerWrite, wallet::base_wallet::BaseWallet};
8-
use did_resolver::{
9-
did_parser::Did,
10-
traits::resolvable::DidResolvable,
11-
};
8+
use did_resolver::{did_parser::Did, traits::resolvable::DidResolvable};
129
use did_resolver_sov::resolution::DidSovResolver;
1310
use test_utils::devsetup::build_setup_profile;
1411

@@ -40,10 +37,7 @@ async fn write_service_on_ledger_and_resolve_did_doc() {
4037
let did = format!("did:sov:{}", profile.institution_did);
4138

4239
let did_doc = resolver
43-
.resolve(
44-
&Did::parse(did.clone()).unwrap(),
45-
&(),
46-
)
40+
.resolve(&Did::parse(did.clone()).unwrap(), &())
4741
.await
4842
.unwrap();
4943

@@ -57,10 +51,7 @@ async fn test_error_handling_during_resolution() {
5751
let did = format!("did:unknownmethod:{}", profile.institution_did);
5852

5953
let result = resolver
60-
.resolve(
61-
&Did::parse(did.clone()).unwrap(),
62-
&(),
63-
)
54+
.resolve(&Did::parse(did.clone()).unwrap(), &())
6455
.await;
6556

6657
assert!(result.is_err());

0 commit comments

Comments
 (0)