Workspace reorganization

.github/actions/derive-cache-info/action.yml

@@ -23,7 +23,7 @@ runs:
     - id: main
       shell: bash
       run: |
-        source ./ci/util.sh
+        source ./.github/ci/util.sh
         DOCKER_IMG=${{ inputs.docker-img }}
         CACHE_KEY=`as_docker_cache_key $DOCKER_IMG`
         CACHE_DIR="/tmp/cachedir-$CACHE_KEY"

.github/actions/setup-codecov-rust/action.yml

@@ -29,4 +29,4 @@ runs:
         docker run --rm -d --name mysql     --network host -e MYSQL_ROOT_PASSWORD=mysecretpassword mysql:5.7.35
         docker run --rm -d --name indypool  --network host ${{ env.DOCKER_IMAGE_POOL }}
         sleep 5
-        docker-compose -f ./ci/agency/docker-compose.yml up -d
+        docker-compose -f ./.github/ci/agency/docker-compose.yml up -d

.github/actions/setup-testing-nodejs/action.yml

@@ -40,7 +40,7 @@ runs:
         docker run --rm -d --name mysql     --network host -e MYSQL_ROOT_PASSWORD=mysecretpassword mysql:5.7.35
         docker run --rm -d --name indypool  --network host ${{ env.DOCKER_IMAGE_POOL }}
         sleep 5
-        docker-compose -f ./ci/agency/docker-compose.yml up -d
+        docker-compose -f ./.github/ci/agency/docker-compose.yml up -d
     - name: "Build binding module"
       shell: bash
       run: (cd wrappers/vcx-napi-rs && npm install && npm run build:napi:debug)

.github/workflows/main.yml

@@ -65,16 +65,15 @@ jobs:
         run: |
           set -x
 
-          HASH_DOCKERFILE_LIBVCX=${{ hashFiles('ci/libvcx.dockerfile') }}
-          HASH_DOCKERFILE_VDRPROXY=${{ hashFiles('ci/vdrproxy.dockerfile') }}
+          HASH_DOCKERFILE_LIBVCX=${{ hashFiles('.github/ci/libvcx.dockerfile') }}
+          HASH_DOCKERFILE_VDRPROXY=${{ hashFiles('.github/ci/vdrproxy.dockerfile') }}
           HASH_SRC_LIBVDRTOOLS=${{ hashFiles('libvdrtools') }}
           HASH_SRC_LIBVCX=${{ hashFiles('libvcx') }}
           HASH_SRC_ARIESVCX=${{ hashFiles('aries_vcx') }}
           HASH_SRC_ARIESVCX_CORE=${{ hashFiles('aries_vcx_core') }}
           HASH_SRC_AGENCYCLIENT=${{ hashFiles('agency_client') }}
           HASH_SRC_DIDDOC=${{ hashFiles('diddoc') }}
           HASH_SRC_MESSAGES=${{ hashFiles('messages') }}
-          HASH_SRC_WRAPPER_JAVA=${{ hashFiles('wrappers/java') }}
 
           SEED_HASH_ARIESVCX=${HASH_SRC_LIBVDRTOOLS:0:11}-${HASH_SRC_ARIESVCX_CORE:0:11}-${HASH_SRC_ARIESVCX:0:11}-${HASH_SRC_AGENCYCLIENT:0:11}-${HASH_SRC_DIDDOC:0:11}-${HASH_SRC_MESSAGES:0:11}}
           HASH_ARIESVCX=$(echo -n "$SEED_HASH_ARIESVCX" | sha256sum | awk '{print $1}')
@@ -233,7 +232,7 @@ jobs:
         uses: ./.github/actions/build-image
         with:
           docker-img: ${{ env.DOCKER_IMG_CACHED }}
-          dockerfile-path: "ci/vdrproxy.dockerfile"
+          dockerfile-path: ".github/ci/vdrproxy.dockerfile"
           build-arg: "ALPINE_CORE_IMAGE=$DOCKER_IMG_CACHED_ALPINE_CORE"
           branch-name: ${{ env.BRANCH_NAME }}
           branch-main: ${{ env.MAIN_BRANCH }}

.gitignore

@@ -4,10 +4,6 @@
 **/node_modules
 **/*.node
 **/dist
-wrappers/ios/vcx/vcx.framework/**
-wrappers/ios/vcx/vcx.framework.dSYM/**
-wrappers/ios_legacy/vcx/vcx.framework/**
-wrappers/ios_legacy/vcx/vcx.framework.dSYM/**
 .vscode
 *.code-workspace
 **/tails.txt

did_doc/src/schema/did_doc.rs

@@ -4,14 +4,13 @@ use did_parser::{Did, DidUrl};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use crate::error::DidDocumentBuilderError;
-
 use super::{
     service::Service,
     types::uri::Uri,
     utils::OneOrList,
     verification_method::{VerificationMethod, VerificationMethodKind},
 };
+use crate::error::DidDocumentBuilderError;
 
 pub type ControllerAlias = OneOrList<Did>;
 

did_doc/src/schema/service.rs

@@ -2,12 +2,11 @@ use std::collections::HashSet;
 
 use serde::{Deserialize, Serialize};
 
-use crate::error::DidDocumentBuilderError;
-
 use super::{
     types::{uri::Uri, url::Url},
     utils::OneOrList,
 };
+use crate::error::DidDocumentBuilderError;
 
 pub type ServiceTypeAlias = OneOrList<String>;
 

did_doc/src/schema/verification_method/mod.rs

@@ -2,15 +2,13 @@ mod public_key;
 mod verification_method_kind;
 mod verification_method_type;
 
-pub use self::public_key::PublicKeyField;
-
 use ::public_key::Key;
-pub use verification_method_kind::VerificationMethodKind;
-pub use verification_method_type::VerificationMethodType;
-
 use did_parser::{Did, DidUrl};
 use serde::{Deserialize, Serialize};
+pub use verification_method_kind::VerificationMethodKind;
+pub use verification_method_type::VerificationMethodType;
 
+pub use self::public_key::PublicKeyField;
 use crate::{error::DidDocumentBuilderError, schema::types::jsonwebkey::JsonWebKey};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]
@@ -160,16 +158,18 @@ impl CompleteVerificationMethodBuilder {
             id: self.id,
             controller: self.controller,
             verification_method_type: self.verification_method_type,
-            public_key: self.public_key.unwrap(), // SAFETY: The builder will always set the public key
+            public_key: self.public_key.unwrap(), /* SAFETY: The builder will always set the
+                                                   * public key */
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use serde_json::Value;
 
+    use super::*;
+
     fn create_valid_did() -> Did {
         Did::parse("did:example:123456789abcdefghi".to_string()).unwrap()
     }

did_parser/src/did.rs

@@ -1,11 +1,12 @@
-use std::convert::TryFrom;
-use std::fmt::{Display, Formatter};
-use std::str::FromStr;
+use std::{
+    convert::TryFrom,
+    fmt::{Display, Formatter},
+    str::FromStr,
+};
 
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-use crate::DidUrl;
-use crate::{error::ParseError, utils::parse::parse_did_method_id, DidRange};
+use crate::{error::ParseError, utils::parse::parse_did_method_id, DidRange, DidUrl};
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct Did {

did_parser/src/utils/parse.rs

@@ -1,5 +1,4 @@
-use crate::error::ParseError;
-use crate::DidRange;
+use crate::{error::ParseError, DidRange};
 
 pub(crate) fn parse_key_value(
     did_url: &str,

did_parser/tests/did_url/positive.rs

@@ -1,6 +1,7 @@
-use did_parser::DidUrl;
 use std::collections::HashMap;
 
+use did_parser::DidUrl;
+
 macro_rules! test_cases_positive {
     ($($name:ident: $input:expr, $expected_did:expr, $expected_method:expr, $expected_id:expr, $expected_path:expr, $expected_fragment:expr, $expected_queries:expr, $expected_params:expr)*) => {
         $(

did_resolver/src/traits/dereferenceable/dereferencing_output.rs

@@ -1,7 +1,7 @@
-use crate::shared_types::did_document_metadata::DidDocumentMetadata;
 use std::io::Read;
 
 use super::dereferencing_metadata::DidDereferencingMetadata;
+use crate::shared_types::did_document_metadata::DidDocumentMetadata;
 
 pub struct DidDereferencingOutput<R: Read + Send + Sync> {
     dereferencing_metadata: DidDereferencingMetadata,

did_resolver/src/traits/dereferenceable/mod.rs

@@ -5,13 +5,13 @@ pub mod dereferencing_output;
 
 use std::io::Read;
 
-use crate::{error::GenericError, traits::resolvable::DidResolvable};
 use async_trait::async_trait;
 use did_parser::DidUrl;
 
 use self::{
     dereferencing_options::DidDereferencingOptions, dereferencing_output::DidDereferencingOutput,
 };
+use crate::{error::GenericError, traits::resolvable::DidResolvable};
 
 #[async_trait]
 pub trait DidDereferenceable: DidResolvable {

did_resolver/src/traits/resolvable/mod.rs

@@ -3,11 +3,11 @@ pub mod resolution_metadata;
 pub mod resolution_options;
 pub mod resolution_output;
 
-use crate::error::GenericError;
 use async_trait::async_trait;
 use did_parser::Did;
 
 use self::{resolution_options::DidResolutionOptions, resolution_output::DidResolutionOutput};
+use crate::error::GenericError;
 
 #[async_trait]
 pub trait DidResolvable {

did_resolver_registry/src/lib.rs

@@ -115,11 +115,13 @@ impl ResolverRegistry {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use std::{error::Error, pin::Pin};
+
     use async_trait::async_trait;
     use did_resolver::did_doc::schema::did_doc::DidDocumentBuilder;
     use mockall::{automock, predicate::eq};
-    use std::{error::Error, pin::Pin};
+
+    use super::*;
 
     struct DummyDidResolver;
 

did_resolver_sov/src/dereferencing/dereferencer.rs

@@ -13,9 +13,8 @@ use did_resolver::{
     },
 };
 
-use crate::resolution::DidSovResolver;
-
 use super::utils::dereference_did_document;
+use crate::resolution::DidSovResolver;
 
 #[async_trait]
 impl DidDereferenceable for DidSovResolver {

did_resolver_sov/src/dereferencing/utils.rs

@@ -91,14 +91,17 @@ pub(crate) fn dereference_did_document<E: Default + Serialize>(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-
-    use did_resolver::did_doc::schema::did_doc::DidDocumentBuilder;
-    use did_resolver::did_doc::schema::verification_method::VerificationMethodType;
-    use did_resolver::did_parser::DidUrl;
-    use did_resolver::traits::resolvable::resolution_output::DidResolutionOutput;
+    use did_resolver::{
+        did_doc::schema::{
+            did_doc::DidDocumentBuilder, verification_method::VerificationMethodType,
+        },
+        did_parser::DidUrl,
+        traits::resolvable::resolution_output::DidResolutionOutput,
+    };
     use serde_json::Value;
 
+    use super::*;
+
     fn example_did_document_builder() -> DidDocumentBuilder<()> {
         let verification_method = VerificationMethod::builder(
             DidUrl::parse("did:example:123456789abcdefghi#keys-1".to_string()).unwrap(),

did_resolver_sov/src/resolution/resolver.rs

@@ -13,13 +13,12 @@ use did_resolver::{
 };
 use serde_json::Value;
 
+use super::utils::{is_valid_sovrin_did_id, ledger_response_to_ddo};
 use crate::{
     error::{parsing::ParsingErrorSource, DidSovError},
     reader::AttrReader,
 };
 
-use super::utils::{is_valid_sovrin_did_id, ledger_response_to_ddo};
-
 pub struct DidSovResolver {
     ledger: Arc<dyn AttrReader>,
 }

did_resolver_sov/src/resolution/utils.rs

@@ -124,10 +124,11 @@ pub(super) async fn ledger_response_to_ddo<E: Default>(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use chrono::TimeZone;
     use did_resolver::did_doc::schema::verification_method::PublicKeyField;
 
+    use super::*;
+
     #[test]
     fn test_prepare_ids() {
         let did = "did:example:1234567890".to_string();

did_resolver_sov/src/service.rs

@@ -1,5 +1,4 @@
-use std::collections::HashSet;
-use std::fmt::Display;
+use std::{collections::HashSet, fmt::Display};
 
 use serde::{Deserialize, Deserializer};
 use url::Url;
@@ -66,10 +65,12 @@ where
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use serde_json::from_str;
     use std::iter::FromIterator;
 
+    use serde_json::from_str;
+
+    use super::*;
+
     #[test]
     fn test_deserialize_endpoint_did_sov() {
         let json = r#"{

did_resolver_sov/tests/resolution.rs

@@ -1,19 +1,18 @@
-use std::sync::Arc;
-use std::thread;
-use std::time::Duration;
+use std::{sync::Arc, thread, time::Duration};
 
-use aries_vcx::core::profile::profile::Profile;
 use aries_vcx::{
     common::ledger::{
         service_didsov::{DidSovServiceType, EndpointDidSov},
         transactions::write_endpoint,
     },
+    core::profile::profile::Profile,
     utils::devsetup::SetupProfile,
 };
-use did_resolver::did_parser::Did;
-use did_resolver::traits::resolvable::{resolution_options::DidResolutionOptions, DidResolvable};
-use did_resolver_sov::reader::ConcreteAttrReader;
-use did_resolver_sov::resolution::DidSovResolver;
+use did_resolver::{
+    did_parser::Did,
+    traits::resolvable::{resolution_options::DidResolutionOptions, DidResolvable},
+};
+use did_resolver_sov::{reader::ConcreteAttrReader, resolution::DidSovResolver};
 
 async fn write_test_endpoint(profile: &Arc<dyn Profile>, did: &str) {
     let endpoint = EndpointDidSov::create()

libvdrtools/indy-api-types/src/domain/wallet/mod.rs

@@ -1,6 +1,7 @@
-use serde_json::value::Value;
 use std::collections::HashMap;
 
+use serde_json::value::Value;
+
 use crate::validation::Validatable;
 
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]