diff --git a/.github/actions/build-napi/action.yml b/.github/actions/build-napi/action.yml index eb6ded59fb..d8a5ed0a9a 100644 --- a/.github/actions/build-napi/action.yml +++ b/.github/actions/build-napi/action.yml @@ -23,7 +23,7 @@ runs: with: node-version: ${{ inputs.node-version }} cache: npm - cache-dependency-path: ${{ github.workspace }}/wrappers/vcx-napi-rs/package-lock.json + cache-dependency-path: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs/package-lock.json - name: Install uses: actions-rs/toolchain@v1 if: ${{ !inputs.docker }} @@ -43,7 +43,7 @@ runs: key: ${{ inputs.target }}-cargo-registry - name: Install dependencies run: npm install - working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs + working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs shell: bash - name: Build in docker uses: addnab/docker-run-action@v3 @@ -55,11 +55,11 @@ runs: - name: Build run: ${{ inputs.build }} if: ${{ !inputs.docker }} - working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs + working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs shell: bash - name: Upload artifact uses: actions/upload-artifact@v3 with: name: bindings-${{ inputs.target }} - path: ${{ github.workspace }}/wrappers/vcx-napi-rs/*.node + path: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs/*.node if-no-files-found: error diff --git a/.github/actions/publish-napi/action.yml b/.github/actions/publish-napi/action.yml index 66532f9832..d4cb99e472 100644 --- a/.github/actions/publish-napi/action.yml +++ b/.github/actions/publish-napi/action.yml @@ -18,21 +18,21 @@ runs: with: node-version: ${{ inputs.node-version }} cache: npm - cache-dependency-path: ${{ github.workspace }}/wrappers/vcx-napi-rs/package-lock.json + cache-dependency-path: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs/package-lock.json - name: Install dependencies run: npm install - working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs + working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs shell: bash - name: Download napi artifacts uses: actions/download-artifact@v3 with: - path: ${{ github.workspace }}/wrappers/vcx-napi-rs/artifacts + path: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs/artifacts - name: Move artifacts run: | find . -type d -not -path \*\*/artifacts/bindings-\* -path \*\*/artifacts/\*\* -mindepth 2 -maxdepth 2 -exec rm -rf {} \+ ls -R artifacts npm run artifacts - working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs + working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs shell: bash - name: Publish run: | @@ -45,7 +45,7 @@ runs: else echo "New version was not defined, skipping release." fi - working-directory: ${{ github.workspace }}/wrappers/vcx-napi-rs + working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs shell: bash env: NPMJS_TOKEN: ${{ inputs.npmjs-token }} diff --git a/.github/actions/setup-testing-nodejs/action.yml b/.github/actions/setup-testing-nodejs/action.yml index 40a8512802..86dfc49019 100644 --- a/.github/actions/setup-testing-nodejs/action.yml +++ b/.github/actions/setup-testing-nodejs/action.yml @@ -43,12 +43,12 @@ runs: 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) + run: (cd aries/wrappers/vcx-napi-rs && npm install && npm run build:napi:debug) - name: "Transpile TS wrapper" shell: bash - run: (cd wrappers/node && npm install && npm run compile) + run: (cd aries/wrappers/node && npm install && npm run compile) - name: "Check wrappers" shell: bash run: | - ls -lah wrappers/vcx-napi-rs - ls -lah wrappers/node + ls -lah aries/wrappers/vcx-napi-rs + ls -lah aries/wrappers/node diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e44f1740d7..755ec9360b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -339,7 +339,7 @@ jobs: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} - name: "Run libvcx_core integration tests" run: | - RUST_TEST_THREADS=1 cargo test --manifest-path="libvcx_core/Cargo.toml" -- --include-ignored; + RUST_TEST_THREADS=1 cargo test --manifest-path="aries/legacy/libvcx_core/Cargo.toml" -- --include-ignored; test-integration-did-crate: needs: workflow-setup @@ -372,7 +372,7 @@ jobs: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} node-version: ${{ matrix.node-version }} - name: "Run wrapper integration tests" - run: (cd wrappers/node && npm run test:integration) + run: (cd aries/wrappers/node && npm run test:integration) - name: "Install vcxagent-core dependencies" run: (cd aries/agents/node/vcxagent-core && npm install) - name: "Run demo" @@ -406,7 +406,7 @@ jobs: run: | if [[ "$PUBLISH_VERSION" ]] then - NPMJS_TOKEN=${{ secrets.NPMJS_TOKEN }} PUBLISH_VERSION=${{ env.PUBLISH_VERSION }} ./wrappers/node/publish.sh + NPMJS_TOKEN=${{ secrets.NPMJS_TOKEN }} PUBLISH_VERSION=${{ env.PUBLISH_VERSION }} ./aries/wrappers/node/publish.sh else echo "New version was not defined, skipping release." fi @@ -460,7 +460,7 @@ jobs: env unset CC unset CXX - cd wrappers/vcx-napi-rs + cd aries/wrappers/vcx-napi-rs npm run build:napi strip *.node - host: macos-latest diff --git a/Cargo.lock b/Cargo.lock index 65bf5bc492..223905332a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -208,7 +208,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "shared_vcx", + "shared", "thiserror", "url", "uuid 0.8.2", @@ -331,7 +331,7 @@ dependencies = [ "log", "serde", "serde_json", - "shared_vcx", + "shared", "thiserror", "url", "uuid 1.5.0", @@ -364,7 +364,7 @@ dependencies = [ "serde_derive", "serde_json", "sha2", - "shared_vcx", + "shared", "strum 0.25.0", "strum_macros 0.25.2", "test_utils", @@ -1453,7 +1453,7 @@ name = "did_parser" version = "0.1.0" dependencies = [ "serde", - "shared_vcx", + "shared", ] [[package]] @@ -1544,7 +1544,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "shared_vcx", + "shared", "thiserror", "url", ] @@ -2743,7 +2743,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "shared_vcx", + "shared", "test_utils", "thiserror", "time 0.3.20", @@ -2954,7 +2954,7 @@ dependencies = [ "messages_macros", "serde", "serde_json", - "shared_vcx", + "shared", "strum 0.24.1", "strum_macros 0.24.3", "thiserror", @@ -2970,7 +2970,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "shared_vcx", + "shared", "syn 2.0.38", ] @@ -4143,7 +4143,7 @@ dependencies = [ ] [[package]] -name = "shared_vcx" +name = "shared" version = "0.61.0" dependencies = [ "bs58 0.4.0", @@ -5059,7 +5059,7 @@ dependencies = [ "once_cell", "serde", "serde_json", - "shared_vcx", + "shared", "thiserror", "tokio", "uniffi", diff --git a/Cargo.toml b/Cargo.toml index 42ed3c5256..06cd8dd95e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,17 +3,17 @@ resolver = "2" members = [ "aries_vcx", - "libvcx_core", - "agency_client", - "libvdrtools", + "aries/legacy/libvcx_core", + "aries/legacy/agency_client", + "aries/legacy/libvdrtools", "messages_macros", "messages", - "shared_vcx", - "diddoc_legacy", + "aries/shared", + "aries/legacy/diddoc_legacy", "aries/agents/rust/mediator", "aries/agents/rust/mediator/client-tui", - "agents/rust/aries-vcx-agent", - "wrappers/vcx-napi-rs", + "aries/agents/rust/aries-vcx-agent", + "aries/wrappers/vcx-napi-rs", "aries_vcx_core", "uniffi_aries_vcx/core", "did_doc", @@ -27,7 +27,7 @@ members = [ "did_resolver_web", "public_key", "indy_ledger_response_parser", - "wallet_migrator", + "tools/wallet_migrator", "tools/simple_message_relay", "tools/test_utils", "tools/libvcx_logger", diff --git a/README.md b/README.md index f774a74967..220116016d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The repository contains a set of crates to build [Aries](https://github.com/hype - [`aries_vcx`](aries_vcx) - Library implementing DIDComm protocols, with focus on verifiable credential issuance and verification. - [`messages`](messages) - Library for building and parsing Aries messages. - `aries_vcx_core` - Interfaces for interaction with ledgers, wallets and credentials. - - [`agents`](agents/rust) - Aries agents built on top of `aries_vcx`. + - [`agents`](aries/agents/rust) - Aries agents built on top of `aries_vcx`. ## General components - `did_parser` - Building and parsing [DIDs](https://w3c.github.io/did-core/). diff --git a/agents/rust/README.md b/agents/rust/README.md deleted file mode 100644 index eb2d1ff2f1..0000000000 --- a/agents/rust/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Rust agents - -This directory contains some of Rust agents built on top of the `aries_vcx` crate: - -- `aries-vcx-agent` - aries agent library providing used to build our cross-framework testing [backchannel](https://github.com/hyperledger/aries-agent-test-harness/tree/main/aries-backchannels/aries-vcx) diff --git a/aries/agents/node/.gitignore b/aries/agents/node/.gitignore index 47f6c2ac81..c7c0c162f2 100644 --- a/aries/agents/node/.gitignore +++ b/aries/agents/node/.gitignore @@ -70,6 +70,6 @@ typings/ # End of https://www.gitignore.io/api/node -**/storage-*/ +vcxagent-core/storage-proofs/ **/test/tmp diff --git a/aries/agents/node/vcxagent-core/package.json b/aries/agents/node/vcxagent-core/package.json index 537b956d52..d16bac541e 100644 --- a/aries/agents/node/vcxagent-core/package.json +++ b/aries/agents/node/vcxagent-core/package.json @@ -47,7 +47,7 @@ "test:integration:connection": "jest --forceExit --env=node --runInBand test/connection.spec.js" }, "dependencies": { - "@hyperledger/node-vcx-wrapper": "file:../../../../wrappers/node", + "@hyperledger/node-vcx-wrapper": "file:../../../wrappers/node", "axios": "^1.6.0", "ffi-napi": "^4.0.3", "fs-extra": "^4.0.3", @@ -68,4 +68,4 @@ "standard": "^16.0.4", "winston": "^3.3.3" } -} \ No newline at end of file +} diff --git a/aries/agents/node/vcxagent-core/readme.md b/aries/agents/node/vcxagent-core/readme.md index 4279b33f30..a4832600ae 100644 --- a/aries/agents/node/vcxagent-core/readme.md +++ b/aries/agents/node/vcxagent-core/readme.md @@ -4,7 +4,7 @@ VCX Agent Core is implementation of simple agent with persistent file storage. I # Try it 1. First step is to compile and `aries-vcx` and make it available on your system. Follow [instructions](../../../libvcx). -2. You need to have mediator agent compatible with `aries-vcx`. See more [info](../../../README.md). +2. You need to have mediator agent compatible with `aries-vcx`. See more [info](../../../../README.md). 3. Run `npm run demo`. This will run sample scenario where Alice and Faber - establish connection, - Faber issues a credential to Alice diff --git a/aries/agents/rust/README.md b/aries/agents/rust/README.md new file mode 100644 index 0000000000..c5cdb0d3de --- /dev/null +++ b/aries/agents/rust/README.md @@ -0,0 +1,6 @@ +# Rust agents + +This directory contains some of Rust agents built on top of the `aries_vcx` crate: + +- [`aries-vcx-agent`](./aries-vcx-agent) - aries agent library providing used to build our cross-framework testing [backchannel](https://github.com/hyperledger/aries-agent-test-harness/tree/main/aries-backchannels/aries-vcx) +- [`mediator`](./mediator) - didcomm mediator service diff --git a/agents/rust/aries-vcx-agent/.gitignore b/aries/agents/rust/aries-vcx-agent/.gitignore similarity index 100% rename from agents/rust/aries-vcx-agent/.gitignore rename to aries/agents/rust/aries-vcx-agent/.gitignore diff --git a/agents/rust/aries-vcx-agent/Cargo.toml b/aries/agents/rust/aries-vcx-agent/Cargo.toml similarity index 70% rename from agents/rust/aries-vcx-agent/Cargo.toml rename to aries/agents/rust/aries-vcx-agent/Cargo.toml index f43bfe2a8f..b8ac705514 100644 --- a/agents/rust/aries-vcx-agent/Cargo.toml +++ b/aries/agents/rust/aries-vcx-agent/Cargo.toml @@ -7,12 +7,12 @@ edition.workspace = true [dependencies] serde = "1.0.145" -aries_vcx = { path = "../../../aries_vcx" } -aries_vcx_core = { path = "../../../aries_vcx_core", features = [ +aries_vcx = { path = "../../../../aries_vcx" } +aries_vcx_core = { path = "../../../../aries_vcx_core", features = [ "credx", "vdrtools_wallet", ] } -shared_vcx = { path = "../../../shared_vcx" } +shared = { path = "../../../shared" } async-trait = "0.1.64" derive_builder = "0.12.0" serde_json = "1.0.85" diff --git a/agents/rust/aries-vcx-agent/src/agent/agent_config.rs b/aries/agents/rust/aries-vcx-agent/src/agent/agent_config.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/agent/agent_config.rs rename to aries/agents/rust/aries-vcx-agent/src/agent/agent_config.rs diff --git a/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs b/aries/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/agent/agent_struct.rs rename to aries/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs diff --git a/agents/rust/aries-vcx-agent/src/agent/init.rs b/aries/agents/rust/aries-vcx-agent/src/agent/init.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/agent/init.rs rename to aries/agents/rust/aries-vcx-agent/src/agent/init.rs diff --git a/agents/rust/aries-vcx-agent/src/agent/mod.rs b/aries/agents/rust/aries-vcx-agent/src/agent/mod.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/agent/mod.rs rename to aries/agents/rust/aries-vcx-agent/src/agent/mod.rs diff --git a/agents/rust/aries-vcx-agent/src/error/convertors.rs b/aries/agents/rust/aries-vcx-agent/src/error/convertors.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/error/convertors.rs rename to aries/agents/rust/aries-vcx-agent/src/error/convertors.rs diff --git a/agents/rust/aries-vcx-agent/src/error/error_kind.rs b/aries/agents/rust/aries-vcx-agent/src/error/error_kind.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/error/error_kind.rs rename to aries/agents/rust/aries-vcx-agent/src/error/error_kind.rs diff --git a/agents/rust/aries-vcx-agent/src/error/error_struct.rs b/aries/agents/rust/aries-vcx-agent/src/error/error_struct.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/error/error_struct.rs rename to aries/agents/rust/aries-vcx-agent/src/error/error_struct.rs diff --git a/agents/rust/aries-vcx-agent/src/error/mod.rs b/aries/agents/rust/aries-vcx-agent/src/error/mod.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/error/mod.rs rename to aries/agents/rust/aries-vcx-agent/src/error/mod.rs diff --git a/agents/rust/aries-vcx-agent/src/error/result.rs b/aries/agents/rust/aries-vcx-agent/src/error/result.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/error/result.rs rename to aries/agents/rust/aries-vcx-agent/src/error/result.rs diff --git a/agents/rust/aries-vcx-agent/src/http.rs b/aries/agents/rust/aries-vcx-agent/src/http.rs similarity index 79% rename from agents/rust/aries-vcx-agent/src/http.rs rename to aries/agents/rust/aries-vcx-agent/src/http.rs index 0571069931..41371446fd 100644 --- a/agents/rust/aries-vcx-agent/src/http.rs +++ b/aries/agents/rust/aries-vcx-agent/src/http.rs @@ -7,7 +7,7 @@ pub struct VcxHttpClient; #[async_trait] impl Transport for VcxHttpClient { async fn send_message(&self, msg: Vec, service_endpoint: Url) -> VcxResult<()> { - shared_vcx::http_client::post_message(msg, service_endpoint).await?; + shared::http_client::post_message(msg, service_endpoint).await?; Ok(()) } } diff --git a/agents/rust/aries-vcx-agent/src/lib.rs b/aries/agents/rust/aries-vcx-agent/src/lib.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/lib.rs rename to aries/agents/rust/aries-vcx-agent/src/lib.rs diff --git a/agents/rust/aries-vcx-agent/src/services/connection.rs b/aries/agents/rust/aries-vcx-agent/src/services/connection.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/services/connection.rs rename to aries/agents/rust/aries-vcx-agent/src/services/connection.rs diff --git a/agents/rust/aries-vcx-agent/src/services/credential_definition.rs b/aries/agents/rust/aries-vcx-agent/src/services/credential_definition.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/services/credential_definition.rs rename to aries/agents/rust/aries-vcx-agent/src/services/credential_definition.rs diff --git a/agents/rust/aries-vcx-agent/src/services/holder.rs b/aries/agents/rust/aries-vcx-agent/src/services/holder.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/services/holder.rs rename to aries/agents/rust/aries-vcx-agent/src/services/holder.rs diff --git a/agents/rust/aries-vcx-agent/src/services/issuer.rs b/aries/agents/rust/aries-vcx-agent/src/services/issuer.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/services/issuer.rs rename to aries/agents/rust/aries-vcx-agent/src/services/issuer.rs diff --git a/agents/rust/aries-vcx-agent/src/services/mod.rs b/aries/agents/rust/aries-vcx-agent/src/services/mod.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/services/mod.rs rename to aries/agents/rust/aries-vcx-agent/src/services/mod.rs diff --git a/agents/rust/aries-vcx-agent/src/services/prover.rs b/aries/agents/rust/aries-vcx-agent/src/services/prover.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/services/prover.rs rename to aries/agents/rust/aries-vcx-agent/src/services/prover.rs diff --git a/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs b/aries/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/services/revocation_registry.rs rename to aries/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs diff --git a/agents/rust/aries-vcx-agent/src/services/schema.rs b/aries/agents/rust/aries-vcx-agent/src/services/schema.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/services/schema.rs rename to aries/agents/rust/aries-vcx-agent/src/services/schema.rs diff --git a/agents/rust/aries-vcx-agent/src/services/verifier.rs b/aries/agents/rust/aries-vcx-agent/src/services/verifier.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/services/verifier.rs rename to aries/agents/rust/aries-vcx-agent/src/services/verifier.rs diff --git a/agents/rust/aries-vcx-agent/src/storage/mod.rs b/aries/agents/rust/aries-vcx-agent/src/storage/mod.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/storage/mod.rs rename to aries/agents/rust/aries-vcx-agent/src/storage/mod.rs diff --git a/agents/rust/aries-vcx-agent/src/storage/object_cache.rs b/aries/agents/rust/aries-vcx-agent/src/storage/object_cache.rs similarity index 100% rename from agents/rust/aries-vcx-agent/src/storage/object_cache.rs rename to aries/agents/rust/aries-vcx-agent/src/storage/object_cache.rs diff --git a/aries/agents/rust/mediator/Cargo.toml b/aries/agents/rust/mediator/Cargo.toml index 6d89d5bfb2..64cdea39f7 100644 --- a/aries/agents/rust/mediator/Cargo.toml +++ b/aries/agents/rust/mediator/Cargo.toml @@ -18,7 +18,7 @@ aries_vcx_core = { path = "../../../../aries_vcx_core", features = [ async-trait = "0.1.73" axum = "0.6" axum-macros = "0.3.8" -diddoc_legacy = { path = "../../../../diddoc_legacy" } +diddoc_legacy = { path = "../../../../aries/legacy/diddoc_legacy" } dotenvy = "0.15" env_logger = "0.10.0" fast_qr = { version = "0.10.2", features = ["svg"] } diff --git a/aries/agents/rust/mediator/src/aries_agent/mod.rs b/aries/agents/rust/mediator/src/aries_agent/mod.rs index c4db4c94f2..7132f6ad8c 100644 --- a/aries/agents/rust/mediator/src/aries_agent/mod.rs +++ b/aries/agents/rust/mediator/src/aries_agent/mod.rs @@ -114,8 +114,7 @@ impl Agent { if let Some(service) = &self.service { let invitation = OutOfBandSender::create() .append_service(&OobService::AriesService(service.clone())) - .oob - .clone(); + .oob; Ok(invitation) } else { Err("No service to create invite for".to_owned()) diff --git a/aries/agents/rust/mediator/src/http_routes/mod.rs b/aries/agents/rust/mediator/src/http_routes/mod.rs index 3998f64afa..2c5c3d21a8 100644 --- a/aries/agents/rust/mediator/src/http_routes/mod.rs +++ b/aries/agents/rust/mediator/src/http_routes/mod.rs @@ -58,9 +58,7 @@ pub async fn handle_didcomm( State(agent): State>, didcomm_msg: Bytes, ) -> Result, String> { - didcomm_handlers::handle_aries(State(agent), didcomm_msg) - .await - .map_err(|e| e.to_string()) + didcomm_handlers::handle_aries(State(agent), didcomm_msg).await } pub async fn readme() -> Html { diff --git a/agency_client/Cargo.toml b/aries/legacy/agency_client/Cargo.toml similarity index 92% rename from agency_client/Cargo.toml rename to aries/legacy/agency_client/Cargo.toml index 9aaa8ea65c..d546dd3e33 100644 --- a/agency_client/Cargo.toml +++ b/aries/legacy/agency_client/Cargo.toml @@ -20,4 +20,4 @@ url = { version = "2.3", features = ["serde"] } uuid = { version = "0.8", default-features = false, features = ["v4"]} thiserror = "1.0.37" async-trait = "0.1.73" -shared_vcx = { path = "../shared_vcx" } +shared = { path = "../../shared" } diff --git a/agency_client/src/agency_client.rs b/aries/legacy/agency_client/src/agency_client.rs similarity index 98% rename from agency_client/src/agency_client.rs rename to aries/legacy/agency_client/src/agency_client.rs index a27646647c..9b626a326b 100644 --- a/agency_client/src/agency_client.rs +++ b/aries/legacy/agency_client/src/agency_client.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use shared_vcx::validation::{did::validate_did, verkey::validate_verkey}; +use shared::validation::{did::validate_did, verkey::validate_verkey}; use url::Url; use crate::{ diff --git a/agency_client/src/api/agent.rs b/aries/legacy/agency_client/src/api/agent.rs similarity index 100% rename from agency_client/src/api/agent.rs rename to aries/legacy/agency_client/src/api/agent.rs diff --git a/agency_client/src/api/downloaded_message.rs b/aries/legacy/agency_client/src/api/downloaded_message.rs similarity index 100% rename from agency_client/src/api/downloaded_message.rs rename to aries/legacy/agency_client/src/api/downloaded_message.rs diff --git a/agency_client/src/api/messaging.rs b/aries/legacy/agency_client/src/api/messaging.rs similarity index 100% rename from agency_client/src/api/messaging.rs rename to aries/legacy/agency_client/src/api/messaging.rs diff --git a/agency_client/src/api/mod.rs b/aries/legacy/agency_client/src/api/mod.rs similarity index 100% rename from agency_client/src/api/mod.rs rename to aries/legacy/agency_client/src/api/mod.rs diff --git a/agency_client/src/api/onboarding.rs b/aries/legacy/agency_client/src/api/onboarding.rs similarity index 100% rename from agency_client/src/api/onboarding.rs rename to aries/legacy/agency_client/src/api/onboarding.rs diff --git a/agency_client/src/configuration.rs b/aries/legacy/agency_client/src/configuration.rs similarity index 100% rename from agency_client/src/configuration.rs rename to aries/legacy/agency_client/src/configuration.rs diff --git a/agency_client/src/errors/error.rs b/aries/legacy/agency_client/src/errors/error.rs similarity index 100% rename from agency_client/src/errors/error.rs rename to aries/legacy/agency_client/src/errors/error.rs diff --git a/agency_client/src/errors/mapping_sharedvcx.rs b/aries/legacy/agency_client/src/errors/mapping_sharedvcx.rs similarity index 90% rename from agency_client/src/errors/mapping_sharedvcx.rs rename to aries/legacy/agency_client/src/errors/mapping_sharedvcx.rs index cfa0581c5e..a5a206b97b 100644 --- a/agency_client/src/errors/mapping_sharedvcx.rs +++ b/aries/legacy/agency_client/src/errors/mapping_sharedvcx.rs @@ -1,4 +1,4 @@ -use shared_vcx::errors::validation::{ValidationError, ValidationErrorKind}; +use shared::errors::validation::{ValidationError, ValidationErrorKind}; use crate::errors::error::{AgencyClientError, AgencyClientErrorKind}; diff --git a/agency_client/src/errors/mod.rs b/aries/legacy/agency_client/src/errors/mod.rs similarity index 100% rename from agency_client/src/errors/mod.rs rename to aries/legacy/agency_client/src/errors/mod.rs diff --git a/agency_client/src/internal/messaging.rs b/aries/legacy/agency_client/src/internal/messaging.rs similarity index 99% rename from agency_client/src/internal/messaging.rs rename to aries/legacy/agency_client/src/internal/messaging.rs index f8db31fc4b..79c595f62d 100644 --- a/agency_client/src/internal/messaging.rs +++ b/aries/legacy/agency_client/src/internal/messaging.rs @@ -1,7 +1,7 @@ use core::u8; use serde_json::Value; -use shared_vcx::http_client::post_message; +use shared::http_client::post_message; use crate::{ agency_client::AgencyClient, diff --git a/agency_client/src/internal/mod.rs b/aries/legacy/agency_client/src/internal/mod.rs similarity index 100% rename from agency_client/src/internal/mod.rs rename to aries/legacy/agency_client/src/internal/mod.rs diff --git a/agency_client/src/lib.rs b/aries/legacy/agency_client/src/lib.rs similarity index 100% rename from agency_client/src/lib.rs rename to aries/legacy/agency_client/src/lib.rs diff --git a/agency_client/src/messages/a2a_message.rs b/aries/legacy/agency_client/src/messages/a2a_message.rs similarity index 100% rename from agency_client/src/messages/a2a_message.rs rename to aries/legacy/agency_client/src/messages/a2a_message.rs diff --git a/agency_client/src/messages/connect.rs b/aries/legacy/agency_client/src/messages/connect.rs similarity index 100% rename from agency_client/src/messages/connect.rs rename to aries/legacy/agency_client/src/messages/connect.rs diff --git a/agency_client/src/messages/create_agent.rs b/aries/legacy/agency_client/src/messages/create_agent.rs similarity index 100% rename from agency_client/src/messages/create_agent.rs rename to aries/legacy/agency_client/src/messages/create_agent.rs diff --git a/agency_client/src/messages/create_key.rs b/aries/legacy/agency_client/src/messages/create_key.rs similarity index 97% rename from agency_client/src/messages/create_key.rs rename to aries/legacy/agency_client/src/messages/create_key.rs index 13863ca7a4..c74e09fcaf 100644 --- a/agency_client/src/messages/create_key.rs +++ b/aries/legacy/agency_client/src/messages/create_key.rs @@ -1,4 +1,4 @@ -use shared_vcx::validation::{did::validate_did, verkey::validate_verkey}; +use shared::validation::{did::validate_did, verkey::validate_verkey}; use crate::{ errors::error::AgencyClientResult, diff --git a/agency_client/src/messages/forward.rs b/aries/legacy/agency_client/src/messages/forward.rs similarity index 100% rename from agency_client/src/messages/forward.rs rename to aries/legacy/agency_client/src/messages/forward.rs diff --git a/agency_client/src/messages/get_messages.rs b/aries/legacy/agency_client/src/messages/get_messages.rs similarity index 100% rename from agency_client/src/messages/get_messages.rs rename to aries/legacy/agency_client/src/messages/get_messages.rs diff --git a/agency_client/src/messages/message_type.rs b/aries/legacy/agency_client/src/messages/message_type.rs similarity index 100% rename from agency_client/src/messages/message_type.rs rename to aries/legacy/agency_client/src/messages/message_type.rs diff --git a/agency_client/src/messages/mod.rs b/aries/legacy/agency_client/src/messages/mod.rs similarity index 100% rename from agency_client/src/messages/mod.rs rename to aries/legacy/agency_client/src/messages/mod.rs diff --git a/agency_client/src/messages/sign_up.rs b/aries/legacy/agency_client/src/messages/sign_up.rs similarity index 100% rename from agency_client/src/messages/sign_up.rs rename to aries/legacy/agency_client/src/messages/sign_up.rs diff --git a/agency_client/src/messages/update_com_method.rs b/aries/legacy/agency_client/src/messages/update_com_method.rs similarity index 100% rename from agency_client/src/messages/update_com_method.rs rename to aries/legacy/agency_client/src/messages/update_com_method.rs diff --git a/agency_client/src/messages/update_connection.rs b/aries/legacy/agency_client/src/messages/update_connection.rs similarity index 100% rename from agency_client/src/messages/update_connection.rs rename to aries/legacy/agency_client/src/messages/update_connection.rs diff --git a/agency_client/src/messages/update_message.rs b/aries/legacy/agency_client/src/messages/update_message.rs similarity index 100% rename from agency_client/src/messages/update_message.rs rename to aries/legacy/agency_client/src/messages/update_message.rs diff --git a/agency_client/src/testing/mocking.rs b/aries/legacy/agency_client/src/testing/mocking.rs similarity index 100% rename from agency_client/src/testing/mocking.rs rename to aries/legacy/agency_client/src/testing/mocking.rs diff --git a/agency_client/src/testing/mod.rs b/aries/legacy/agency_client/src/testing/mod.rs similarity index 100% rename from agency_client/src/testing/mod.rs rename to aries/legacy/agency_client/src/testing/mod.rs diff --git a/agency_client/src/testing/test_constants.rs b/aries/legacy/agency_client/src/testing/test_constants.rs similarity index 100% rename from agency_client/src/testing/test_constants.rs rename to aries/legacy/agency_client/src/testing/test_constants.rs diff --git a/agency_client/src/testing/test_settings.rs b/aries/legacy/agency_client/src/testing/test_settings.rs similarity index 100% rename from agency_client/src/testing/test_settings.rs rename to aries/legacy/agency_client/src/testing/test_settings.rs diff --git a/agency_client/src/testing/test_utils.rs b/aries/legacy/agency_client/src/testing/test_utils.rs similarity index 100% rename from agency_client/src/testing/test_utils.rs rename to aries/legacy/agency_client/src/testing/test_utils.rs diff --git a/agency_client/src/utils/encryption_envelope.rs b/aries/legacy/agency_client/src/utils/encryption_envelope.rs similarity index 100% rename from agency_client/src/utils/encryption_envelope.rs rename to aries/legacy/agency_client/src/utils/encryption_envelope.rs diff --git a/agency_client/src/utils/mod.rs b/aries/legacy/agency_client/src/utils/mod.rs similarity index 100% rename from agency_client/src/utils/mod.rs rename to aries/legacy/agency_client/src/utils/mod.rs diff --git a/agency_client/src/wallet/base_agency_client_wallet.rs b/aries/legacy/agency_client/src/wallet/base_agency_client_wallet.rs similarity index 100% rename from agency_client/src/wallet/base_agency_client_wallet.rs rename to aries/legacy/agency_client/src/wallet/base_agency_client_wallet.rs diff --git a/agency_client/src/wallet/mod.rs b/aries/legacy/agency_client/src/wallet/mod.rs similarity index 100% rename from agency_client/src/wallet/mod.rs rename to aries/legacy/agency_client/src/wallet/mod.rs diff --git a/diddoc_legacy/Cargo.toml b/aries/legacy/diddoc_legacy/Cargo.toml similarity index 89% rename from diddoc_legacy/Cargo.toml rename to aries/legacy/diddoc_legacy/Cargo.toml index 0f351c5aff..5ec94faa93 100644 --- a/diddoc_legacy/Cargo.toml +++ b/aries/legacy/diddoc_legacy/Cargo.toml @@ -14,7 +14,7 @@ serde_json = "1.0.40" serde_derive = "1.0.97" url = { version = "2.3", features = ["serde"] } thiserror = "1.0.37" -shared_vcx = { path = "../shared_vcx" } +shared = { path = "../../shared" } [dev-dependencies] serde_json = "1.0.91" diff --git a/diddoc_legacy/src/aries/diddoc.rs b/aries/legacy/diddoc_legacy/src/aries/diddoc.rs similarity index 99% rename from diddoc_legacy/src/aries/diddoc.rs rename to aries/legacy/diddoc_legacy/src/aries/diddoc.rs index d9bd546cc7..d153df0225 100644 --- a/diddoc_legacy/src/aries/diddoc.rs +++ b/aries/legacy/diddoc_legacy/src/aries/diddoc.rs @@ -1,4 +1,4 @@ -use shared_vcx::validation::verkey::validate_verkey; +use shared::validation::verkey::validate_verkey; use url::Url; use crate::{ diff --git a/diddoc_legacy/src/aries/mod.rs b/aries/legacy/diddoc_legacy/src/aries/mod.rs similarity index 100% rename from diddoc_legacy/src/aries/mod.rs rename to aries/legacy/diddoc_legacy/src/aries/mod.rs diff --git a/diddoc_legacy/src/aries/service.rs b/aries/legacy/diddoc_legacy/src/aries/service.rs similarity index 100% rename from diddoc_legacy/src/aries/service.rs rename to aries/legacy/diddoc_legacy/src/aries/service.rs diff --git a/diddoc_legacy/src/errors/error.rs b/aries/legacy/diddoc_legacy/src/errors/error.rs similarity index 100% rename from diddoc_legacy/src/errors/error.rs rename to aries/legacy/diddoc_legacy/src/errors/error.rs diff --git a/diddoc_legacy/src/errors/mapping_sharedvcx.rs b/aries/legacy/diddoc_legacy/src/errors/mapping_sharedvcx.rs similarity index 89% rename from diddoc_legacy/src/errors/mapping_sharedvcx.rs rename to aries/legacy/diddoc_legacy/src/errors/mapping_sharedvcx.rs index 096f1f25f5..77cafc7033 100644 --- a/diddoc_legacy/src/errors/mapping_sharedvcx.rs +++ b/aries/legacy/diddoc_legacy/src/errors/mapping_sharedvcx.rs @@ -1,4 +1,4 @@ -use shared_vcx::errors::validation::{ValidationError, ValidationErrorKind}; +use shared::errors::validation::{ValidationError, ValidationErrorKind}; use crate::errors::error::{DiddocError, DiddocErrorKind}; diff --git a/diddoc_legacy/src/errors/mod.rs b/aries/legacy/diddoc_legacy/src/errors/mod.rs similarity index 100% rename from diddoc_legacy/src/errors/mod.rs rename to aries/legacy/diddoc_legacy/src/errors/mod.rs diff --git a/diddoc_legacy/src/lib.rs b/aries/legacy/diddoc_legacy/src/lib.rs similarity index 92% rename from diddoc_legacy/src/lib.rs rename to aries/legacy/diddoc_legacy/src/lib.rs index b26abc7707..3b818989e6 100644 --- a/diddoc_legacy/src/lib.rs +++ b/aries/legacy/diddoc_legacy/src/lib.rs @@ -7,7 +7,7 @@ #[macro_use] extern crate serde_derive; -extern crate shared_vcx; +extern crate shared; pub mod aries; pub mod errors; pub mod w3c; diff --git a/diddoc_legacy/src/w3c/diddoc.rs b/aries/legacy/diddoc_legacy/src/w3c/diddoc.rs similarity index 100% rename from diddoc_legacy/src/w3c/diddoc.rs rename to aries/legacy/diddoc_legacy/src/w3c/diddoc.rs diff --git a/diddoc_legacy/src/w3c/mod.rs b/aries/legacy/diddoc_legacy/src/w3c/mod.rs similarity index 100% rename from diddoc_legacy/src/w3c/mod.rs rename to aries/legacy/diddoc_legacy/src/w3c/mod.rs diff --git a/diddoc_legacy/src/w3c/model.rs b/aries/legacy/diddoc_legacy/src/w3c/model.rs similarity index 100% rename from diddoc_legacy/src/w3c/model.rs rename to aries/legacy/diddoc_legacy/src/w3c/model.rs diff --git a/diddoc_legacy/src/w3c/service.rs b/aries/legacy/diddoc_legacy/src/w3c/service.rs similarity index 100% rename from diddoc_legacy/src/w3c/service.rs rename to aries/legacy/diddoc_legacy/src/w3c/service.rs diff --git a/libvcx_core/Cargo.toml b/aries/legacy/libvcx_core/Cargo.toml similarity index 73% rename from libvcx_core/Cargo.toml rename to aries/legacy/libvcx_core/Cargo.toml index c5d2b41f94..fb3605d587 100644 --- a/libvcx_core/Cargo.toml +++ b/aries/legacy/libvcx_core/Cargo.toml @@ -23,17 +23,17 @@ serde = "1.0.97" serde_json = "1.0.40" serde_derive = "1.0.97" futures = { version = "0.3", default-features = false } -aries_vcx = { path = "../aries_vcx", features = ["credx", "vdrtools_wallet"] } -aries_vcx_core = { path = "../aries_vcx_core" } +aries_vcx = { path = "../../../aries_vcx", features = ["credx", "vdrtools_wallet"] } +aries_vcx_core = { path = "../../../aries_vcx_core" } diddoc_legacy = { path = "../diddoc_legacy" } thiserror = "1.0.37" uuid = { version = "1.4.1", default-features = false, features = ["v4"] } agency_client = { path = "../agency_client" } async-trait = "0.1.61" url = "2.3.1" -wallet_migrator = { path = "../wallet_migrator" } -shared_vcx = { path = "../shared_vcx" } +wallet_migrator = { path = "../../../tools/wallet_migrator" } +shared = { path = "../../shared" } [dev-dependencies] -test_utils = {path = "../tools/test_utils" } +test_utils = {path = "../../../tools/test_utils" } tokio = { version = "1.20", features = [ "rt", "macros" ] } diff --git a/libvcx_core/build.rs b/aries/legacy/libvcx_core/build.rs similarity index 100% rename from libvcx_core/build.rs rename to aries/legacy/libvcx_core/build.rs diff --git a/libvcx_core/src/api_vcx/api_global/agency_client.rs b/aries/legacy/libvcx_core/src/api_vcx/api_global/agency_client.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_global/agency_client.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_global/agency_client.rs diff --git a/libvcx_core/src/api_vcx/api_global/ledger.rs b/aries/legacy/libvcx_core/src/api_vcx/api_global/ledger.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_global/ledger.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_global/ledger.rs diff --git a/libvcx_core/src/api_vcx/api_global/mod.rs b/aries/legacy/libvcx_core/src/api_vcx/api_global/mod.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_global/mod.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_global/mod.rs diff --git a/libvcx_core/src/api_vcx/api_global/pool.rs b/aries/legacy/libvcx_core/src/api_vcx/api_global/pool.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_global/pool.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_global/pool.rs diff --git a/libvcx_core/src/api_vcx/api_global/profile.rs b/aries/legacy/libvcx_core/src/api_vcx/api_global/profile.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_global/profile.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_global/profile.rs diff --git a/libvcx_core/src/api_vcx/api_global/state.rs b/aries/legacy/libvcx_core/src/api_vcx/api_global/state.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_global/state.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_global/state.rs diff --git a/libvcx_core/src/api_vcx/api_global/wallet.rs b/aries/legacy/libvcx_core/src/api_vcx/api_global/wallet.rs similarity index 99% rename from libvcx_core/src/api_vcx/api_global/wallet.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_global/wallet.rs index ab69f83e04..c5fad7af17 100644 --- a/libvcx_core/src/api_vcx/api_global/wallet.rs +++ b/aries/legacy/libvcx_core/src/api_vcx/api_global/wallet.rs @@ -55,7 +55,7 @@ fn setup_global_wallet(wallet_handle: WalletHandle) -> LibvcxResult<()> { // new way let base_wallet_impl = build_component_base_wallet(wallet_handle); let mut b_wallet = GLOBAL_BASE_WALLET.write()?; - *b_wallet = Some(base_wallet_impl.clone()); + *b_wallet = Some(base_wallet_impl); // anoncreds let base_anoncreds_impl = Arc::new(IndyCredxAnonCreds); let mut b_anoncreds = GLOBAL_BASE_ANONCREDS.write()?; diff --git a/libvcx_core/src/api_vcx/api_handle/connection.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/connection.rs similarity index 99% rename from libvcx_core/src/api_vcx/api_handle/connection.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/connection.rs index 3cc00fc8cd..c0e60fbb30 100644 --- a/libvcx_core/src/api_vcx/api_handle/connection.rs +++ b/aries/legacy/libvcx_core/src/api_vcx/api_handle/connection.rs @@ -11,7 +11,7 @@ use aries_vcx::{ }; use async_trait::async_trait; use rand::Rng; -use shared_vcx::http_client::post_message; +use shared::http_client::post_message; use url::Url; use crate::{ diff --git a/libvcx_core/src/api_vcx/api_handle/credential.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/credential.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/credential.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/credential.rs diff --git a/libvcx_core/src/api_vcx/api_handle/credential_def.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/credential_def.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/credential_def.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/credential_def.rs diff --git a/libvcx_core/src/api_vcx/api_handle/disclosed_proof.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/disclosed_proof.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/disclosed_proof.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/disclosed_proof.rs diff --git a/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/issuer_credential.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/issuer_credential.rs diff --git a/libvcx_core/src/api_vcx/api_handle/mediated_connection.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/mediated_connection.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/mediated_connection.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/mediated_connection.rs diff --git a/libvcx_core/src/api_vcx/api_handle/mod.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/mod.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/mod.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/mod.rs diff --git a/libvcx_core/src/api_vcx/api_handle/object_cache/mod.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/object_cache/mod.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/object_cache/mod.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/object_cache/mod.rs diff --git a/libvcx_core/src/api_vcx/api_handle/out_of_band.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/out_of_band.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/out_of_band.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/out_of_band.rs diff --git a/libvcx_core/src/api_vcx/api_handle/proof.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/proof.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/proof.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/proof.rs diff --git a/libvcx_core/src/api_vcx/api_handle/revocation_registry.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/revocation_registry.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/revocation_registry.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/revocation_registry.rs diff --git a/libvcx_core/src/api_vcx/api_handle/schema.rs b/aries/legacy/libvcx_core/src/api_vcx/api_handle/schema.rs similarity index 100% rename from libvcx_core/src/api_vcx/api_handle/schema.rs rename to aries/legacy/libvcx_core/src/api_vcx/api_handle/schema.rs diff --git a/libvcx_core/src/api_vcx/mod.rs b/aries/legacy/libvcx_core/src/api_vcx/mod.rs similarity index 100% rename from libvcx_core/src/api_vcx/mod.rs rename to aries/legacy/libvcx_core/src/api_vcx/mod.rs diff --git a/libvcx_core/src/api_vcx/utils/mod.rs b/aries/legacy/libvcx_core/src/api_vcx/utils/mod.rs similarity index 100% rename from libvcx_core/src/api_vcx/utils/mod.rs rename to aries/legacy/libvcx_core/src/api_vcx/utils/mod.rs diff --git a/libvcx_core/src/api_vcx/utils/version_constants.rs b/aries/legacy/libvcx_core/src/api_vcx/utils/version_constants.rs similarity index 100% rename from libvcx_core/src/api_vcx/utils/version_constants.rs rename to aries/legacy/libvcx_core/src/api_vcx/utils/version_constants.rs diff --git a/libvcx_core/src/errors/error.rs b/aries/legacy/libvcx_core/src/errors/error.rs similarity index 100% rename from libvcx_core/src/errors/error.rs rename to aries/legacy/libvcx_core/src/errors/error.rs diff --git a/libvcx_core/src/errors/mapping_ffi_tests.rs b/aries/legacy/libvcx_core/src/errors/mapping_ffi_tests.rs similarity index 100% rename from libvcx_core/src/errors/mapping_ffi_tests.rs rename to aries/legacy/libvcx_core/src/errors/mapping_ffi_tests.rs diff --git a/libvcx_core/src/errors/mapping_from_agency_client.rs b/aries/legacy/libvcx_core/src/errors/mapping_from_agency_client.rs similarity index 100% rename from libvcx_core/src/errors/mapping_from_agency_client.rs rename to aries/legacy/libvcx_core/src/errors/mapping_from_agency_client.rs diff --git a/libvcx_core/src/errors/mapping_from_ariesvcx.rs b/aries/legacy/libvcx_core/src/errors/mapping_from_ariesvcx.rs similarity index 100% rename from libvcx_core/src/errors/mapping_from_ariesvcx.rs rename to aries/legacy/libvcx_core/src/errors/mapping_from_ariesvcx.rs diff --git a/libvcx_core/src/errors/mapping_from_ariesvcxcore.rs b/aries/legacy/libvcx_core/src/errors/mapping_from_ariesvcxcore.rs similarity index 100% rename from libvcx_core/src/errors/mapping_from_ariesvcxcore.rs rename to aries/legacy/libvcx_core/src/errors/mapping_from_ariesvcxcore.rs diff --git a/libvcx_core/src/errors/mapping_from_others.rs b/aries/legacy/libvcx_core/src/errors/mapping_from_others.rs similarity index 100% rename from libvcx_core/src/errors/mapping_from_others.rs rename to aries/legacy/libvcx_core/src/errors/mapping_from_others.rs diff --git a/libvcx_core/src/errors/mapping_to_u32.rs b/aries/legacy/libvcx_core/src/errors/mapping_to_u32.rs similarity index 100% rename from libvcx_core/src/errors/mapping_to_u32.rs rename to aries/legacy/libvcx_core/src/errors/mapping_to_u32.rs diff --git a/libvcx_core/src/errors/mod.rs b/aries/legacy/libvcx_core/src/errors/mod.rs similarity index 100% rename from libvcx_core/src/errors/mod.rs rename to aries/legacy/libvcx_core/src/errors/mod.rs diff --git a/libvcx_core/src/lib.rs b/aries/legacy/libvcx_core/src/lib.rs similarity index 100% rename from libvcx_core/src/lib.rs rename to aries/legacy/libvcx_core/src/lib.rs diff --git a/libvdrtools/Cargo.toml b/aries/legacy/libvdrtools/Cargo.toml similarity index 91% rename from libvdrtools/Cargo.toml rename to aries/legacy/libvdrtools/Cargo.toml index 284bac6a5a..ee932f628e 100644 --- a/libvdrtools/Cargo.toml +++ b/aries/legacy/libvdrtools/Cargo.toml @@ -40,9 +40,9 @@ serde_derive = "1" lazy_static = "1" zeroize = "1" regex = "1" -indy-api-types = { path = "./indy-api-types"} -indy-utils = { path = "./indy-utils"} -indy-wallet = { path = "./indy-wallet"} +indy-api-types = { path = "indy-api-types" } +indy-utils = { path = "indy-utils" } +indy-wallet = { path = "indy-wallet" } futures = { version = "0.3", default-features = false, features = [ "executor", "alloc", "thread-pool" ] } ursa = { version = "0.3.7", optional = true, default-features = false, features = ["cl_native"] } diff --git a/libvdrtools/indy-api-types/Cargo.toml b/aries/legacy/libvdrtools/indy-api-types/Cargo.toml similarity index 100% rename from libvdrtools/indy-api-types/Cargo.toml rename to aries/legacy/libvdrtools/indy-api-types/Cargo.toml diff --git a/libvdrtools/indy-api-types/src/domain/mod.rs b/aries/legacy/libvdrtools/indy-api-types/src/domain/mod.rs similarity index 100% rename from libvdrtools/indy-api-types/src/domain/mod.rs rename to aries/legacy/libvdrtools/indy-api-types/src/domain/mod.rs diff --git a/libvdrtools/indy-api-types/src/domain/wallet/mod.rs b/aries/legacy/libvdrtools/indy-api-types/src/domain/wallet/mod.rs similarity index 100% rename from libvdrtools/indy-api-types/src/domain/wallet/mod.rs rename to aries/legacy/libvdrtools/indy-api-types/src/domain/wallet/mod.rs diff --git a/libvdrtools/indy-api-types/src/errors.rs b/aries/legacy/libvdrtools/indy-api-types/src/errors.rs similarity index 100% rename from libvdrtools/indy-api-types/src/errors.rs rename to aries/legacy/libvdrtools/indy-api-types/src/errors.rs diff --git a/libvdrtools/indy-api-types/src/lib.rs b/aries/legacy/libvdrtools/indy-api-types/src/lib.rs similarity index 100% rename from libvdrtools/indy-api-types/src/lib.rs rename to aries/legacy/libvdrtools/indy-api-types/src/lib.rs diff --git a/libvdrtools/indy-utils/Cargo.toml b/aries/legacy/libvdrtools/indy-utils/Cargo.toml similarity index 95% rename from libvdrtools/indy-utils/Cargo.toml rename to aries/legacy/libvdrtools/indy-utils/Cargo.toml index 9b7bc91bbf..d022fca29d 100644 --- a/libvdrtools/indy-utils/Cargo.toml +++ b/aries/legacy/libvdrtools/indy-utils/Cargo.toml @@ -22,7 +22,7 @@ randombytes_sodium = [] base64 = {version = "0.21"} dirs = "5" failure = "0.1" -indy-api-types = { path = "../indy-api-types"} +indy-api-types = { path = "../indy-api-types" } lazy_static = "1" libc = "0.2" log = "0.4" diff --git a/libvdrtools/indy-utils/src/crypto/base64/rust_base64.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/base64/rust_base64.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/base64/rust_base64.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/base64/rust_base64.rs diff --git a/libvdrtools/indy-utils/src/crypto/chacha20poly1305_ietf/sodium.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/chacha20poly1305_ietf/sodium.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/chacha20poly1305_ietf/sodium.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/chacha20poly1305_ietf/sodium.rs diff --git a/libvdrtools/indy-utils/src/crypto/ed25519_box/sodium.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/ed25519_box/sodium.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/ed25519_box/sodium.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/ed25519_box/sodium.rs diff --git a/libvdrtools/indy-utils/src/crypto/ed25519_sign/sodium.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/ed25519_sign/sodium.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/ed25519_sign/sodium.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/ed25519_sign/sodium.rs diff --git a/libvdrtools/indy-utils/src/crypto/hash/openssl.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/hash/openssl.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/hash/openssl.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/hash/openssl.rs diff --git a/libvdrtools/indy-utils/src/crypto/hmacsha256/sodium.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/hmacsha256/sodium.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/hmacsha256/sodium.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/hmacsha256/sodium.rs diff --git a/libvdrtools/indy-utils/src/crypto/mod.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/mod.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/mod.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/mod.rs diff --git a/libvdrtools/indy-utils/src/crypto/pwhash_argon2i13/sodium.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/pwhash_argon2i13/sodium.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/pwhash_argon2i13/sodium.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/pwhash_argon2i13/sodium.rs diff --git a/libvdrtools/indy-utils/src/crypto/randombytes/sodium.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/randombytes/sodium.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/randombytes/sodium.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/randombytes/sodium.rs diff --git a/libvdrtools/indy-utils/src/crypto/sealedbox/sodium.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/sealedbox/sodium.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/sealedbox/sodium.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/sealedbox/sodium.rs diff --git a/libvdrtools/indy-utils/src/crypto/sodium_type.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/sodium_type.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/sodium_type.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/sodium_type.rs diff --git a/libvdrtools/indy-utils/src/crypto/xsalsa20/sodium.rs b/aries/legacy/libvdrtools/indy-utils/src/crypto/xsalsa20/sodium.rs similarity index 100% rename from libvdrtools/indy-utils/src/crypto/xsalsa20/sodium.rs rename to aries/legacy/libvdrtools/indy-utils/src/crypto/xsalsa20/sodium.rs diff --git a/libvdrtools/indy-utils/src/environment.rs b/aries/legacy/libvdrtools/indy-utils/src/environment.rs similarity index 100% rename from libvdrtools/indy-utils/src/environment.rs rename to aries/legacy/libvdrtools/indy-utils/src/environment.rs diff --git a/libvdrtools/indy-utils/src/lib.rs b/aries/legacy/libvdrtools/indy-utils/src/lib.rs similarity index 100% rename from libvdrtools/indy-utils/src/lib.rs rename to aries/legacy/libvdrtools/indy-utils/src/lib.rs diff --git a/libvdrtools/indy-utils/src/sequence.rs b/aries/legacy/libvdrtools/indy-utils/src/sequence.rs similarity index 100% rename from libvdrtools/indy-utils/src/sequence.rs rename to aries/legacy/libvdrtools/indy-utils/src/sequence.rs diff --git a/libvdrtools/indy-utils/src/wql.rs b/aries/legacy/libvdrtools/indy-utils/src/wql.rs similarity index 100% rename from libvdrtools/indy-utils/src/wql.rs rename to aries/legacy/libvdrtools/indy-utils/src/wql.rs diff --git a/libvdrtools/indy-wallet/Cargo.toml b/aries/legacy/libvdrtools/indy-wallet/Cargo.toml similarity index 94% rename from libvdrtools/indy-wallet/Cargo.toml rename to aries/legacy/libvdrtools/indy-wallet/Cargo.toml index 7d3c951630..88d5bd99ad 100644 --- a/libvdrtools/indy-wallet/Cargo.toml +++ b/aries/legacy/libvdrtools/indy-wallet/Cargo.toml @@ -16,7 +16,7 @@ async-trait = "0.1" byteorder = "1" futures = { version = "0.3", default-features = false, features = [ "alloc" ] } indy-api-types = { path = "../indy-api-types" } -indy-utils = { path = "../indy-utils"} +indy-utils = { path = "../indy-utils" } libc = "0.2" log = "0.4" rmp-serde = "1" diff --git a/libvdrtools/indy-wallet/src/cache/lru.rs b/aries/legacy/libvdrtools/indy-wallet/src/cache/lru.rs similarity index 100% rename from libvdrtools/indy-wallet/src/cache/lru.rs rename to aries/legacy/libvdrtools/indy-wallet/src/cache/lru.rs diff --git a/libvdrtools/indy-wallet/src/cache/mod.rs b/aries/legacy/libvdrtools/indy-wallet/src/cache/mod.rs similarity index 100% rename from libvdrtools/indy-wallet/src/cache/mod.rs rename to aries/legacy/libvdrtools/indy-wallet/src/cache/mod.rs diff --git a/libvdrtools/indy-wallet/src/cache/wallet_cache.rs b/aries/legacy/libvdrtools/indy-wallet/src/cache/wallet_cache.rs similarity index 100% rename from libvdrtools/indy-wallet/src/cache/wallet_cache.rs rename to aries/legacy/libvdrtools/indy-wallet/src/cache/wallet_cache.rs diff --git a/libvdrtools/indy-wallet/src/encryption.rs b/aries/legacy/libvdrtools/indy-wallet/src/encryption.rs similarity index 100% rename from libvdrtools/indy-wallet/src/encryption.rs rename to aries/legacy/libvdrtools/indy-wallet/src/encryption.rs diff --git a/libvdrtools/indy-wallet/src/export_import.rs b/aries/legacy/libvdrtools/indy-wallet/src/export_import.rs similarity index 100% rename from libvdrtools/indy-wallet/src/export_import.rs rename to aries/legacy/libvdrtools/indy-wallet/src/export_import.rs diff --git a/libvdrtools/indy-wallet/src/iterator.rs b/aries/legacy/libvdrtools/indy-wallet/src/iterator.rs similarity index 100% rename from libvdrtools/indy-wallet/src/iterator.rs rename to aries/legacy/libvdrtools/indy-wallet/src/iterator.rs diff --git a/libvdrtools/indy-wallet/src/language.rs b/aries/legacy/libvdrtools/indy-wallet/src/language.rs similarity index 100% rename from libvdrtools/indy-wallet/src/language.rs rename to aries/legacy/libvdrtools/indy-wallet/src/language.rs diff --git a/libvdrtools/indy-wallet/src/lib.rs b/aries/legacy/libvdrtools/indy-wallet/src/lib.rs similarity index 100% rename from libvdrtools/indy-wallet/src/lib.rs rename to aries/legacy/libvdrtools/indy-wallet/src/lib.rs diff --git a/libvdrtools/indy-wallet/src/query_encryption.rs b/aries/legacy/libvdrtools/indy-wallet/src/query_encryption.rs similarity index 100% rename from libvdrtools/indy-wallet/src/query_encryption.rs rename to aries/legacy/libvdrtools/indy-wallet/src/query_encryption.rs diff --git a/libvdrtools/indy-wallet/src/storage/default/mod.rs b/aries/legacy/libvdrtools/indy-wallet/src/storage/default/mod.rs similarity index 100% rename from libvdrtools/indy-wallet/src/storage/default/mod.rs rename to aries/legacy/libvdrtools/indy-wallet/src/storage/default/mod.rs diff --git a/libvdrtools/indy-wallet/src/storage/default/query.rs b/aries/legacy/libvdrtools/indy-wallet/src/storage/default/query.rs similarity index 100% rename from libvdrtools/indy-wallet/src/storage/default/query.rs rename to aries/legacy/libvdrtools/indy-wallet/src/storage/default/query.rs diff --git a/libvdrtools/indy-wallet/src/storage/mod.rs b/aries/legacy/libvdrtools/indy-wallet/src/storage/mod.rs similarity index 100% rename from libvdrtools/indy-wallet/src/storage/mod.rs rename to aries/legacy/libvdrtools/indy-wallet/src/storage/mod.rs diff --git a/libvdrtools/indy-wallet/src/storage/mysql/mod.rs b/aries/legacy/libvdrtools/indy-wallet/src/storage/mysql/mod.rs similarity index 100% rename from libvdrtools/indy-wallet/src/storage/mysql/mod.rs rename to aries/legacy/libvdrtools/indy-wallet/src/storage/mysql/mod.rs diff --git a/libvdrtools/indy-wallet/src/storage/mysql/query.rs b/aries/legacy/libvdrtools/indy-wallet/src/storage/mysql/query.rs similarity index 100% rename from libvdrtools/indy-wallet/src/storage/mysql/query.rs rename to aries/legacy/libvdrtools/indy-wallet/src/storage/mysql/query.rs diff --git a/libvdrtools/indy-wallet/src/wallet.rs b/aries/legacy/libvdrtools/indy-wallet/src/wallet.rs similarity index 100% rename from libvdrtools/indy-wallet/src/wallet.rs rename to aries/legacy/libvdrtools/indy-wallet/src/wallet.rs diff --git a/libvdrtools/src/controllers/crypto.rs b/aries/legacy/libvdrtools/src/controllers/crypto.rs similarity index 100% rename from libvdrtools/src/controllers/crypto.rs rename to aries/legacy/libvdrtools/src/controllers/crypto.rs diff --git a/libvdrtools/src/controllers/did.rs b/aries/legacy/libvdrtools/src/controllers/did.rs similarity index 100% rename from libvdrtools/src/controllers/did.rs rename to aries/legacy/libvdrtools/src/controllers/did.rs diff --git a/libvdrtools/src/controllers/mod.rs b/aries/legacy/libvdrtools/src/controllers/mod.rs similarity index 100% rename from libvdrtools/src/controllers/mod.rs rename to aries/legacy/libvdrtools/src/controllers/mod.rs diff --git a/libvdrtools/src/controllers/non_secrets.rs b/aries/legacy/libvdrtools/src/controllers/non_secrets.rs similarity index 100% rename from libvdrtools/src/controllers/non_secrets.rs rename to aries/legacy/libvdrtools/src/controllers/non_secrets.rs diff --git a/libvdrtools/src/controllers/wallet.rs b/aries/legacy/libvdrtools/src/controllers/wallet.rs similarity index 100% rename from libvdrtools/src/controllers/wallet.rs rename to aries/legacy/libvdrtools/src/controllers/wallet.rs diff --git a/libvdrtools/src/domain/anoncreds/credential.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/credential.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/credential.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/credential.rs diff --git a/libvdrtools/src/domain/anoncreds/credential_definition.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/credential_definition.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/credential_definition.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/credential_definition.rs diff --git a/libvdrtools/src/domain/anoncreds/credential_offer.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/credential_offer.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/credential_offer.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/credential_offer.rs diff --git a/libvdrtools/src/domain/anoncreds/credential_request.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/credential_request.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/credential_request.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/credential_request.rs diff --git a/libvdrtools/src/domain/anoncreds/indy_identifiers.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/indy_identifiers.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/indy_identifiers.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/indy_identifiers.rs diff --git a/libvdrtools/src/domain/anoncreds/master_secret.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/master_secret.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/master_secret.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/master_secret.rs diff --git a/libvdrtools/src/domain/anoncreds/mod.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/mod.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/mod.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/mod.rs diff --git a/libvdrtools/src/domain/anoncreds/proof.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/proof.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/proof.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/proof.rs diff --git a/libvdrtools/src/domain/anoncreds/proof_request.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/proof_request.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/proof_request.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/proof_request.rs diff --git a/libvdrtools/src/domain/anoncreds/requested_credential.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/requested_credential.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/requested_credential.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/requested_credential.rs diff --git a/libvdrtools/src/domain/anoncreds/revocation_registry.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/revocation_registry.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/revocation_registry.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/revocation_registry.rs diff --git a/libvdrtools/src/domain/anoncreds/revocation_registry_definition.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/revocation_registry_definition.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/revocation_registry_definition.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/revocation_registry_definition.rs diff --git a/libvdrtools/src/domain/anoncreds/revocation_registry_delta.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/revocation_registry_delta.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/revocation_registry_delta.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/revocation_registry_delta.rs diff --git a/libvdrtools/src/domain/anoncreds/schema.rs b/aries/legacy/libvdrtools/src/domain/anoncreds/schema.rs similarity index 100% rename from libvdrtools/src/domain/anoncreds/schema.rs rename to aries/legacy/libvdrtools/src/domain/anoncreds/schema.rs diff --git a/libvdrtools/src/domain/cache.rs b/aries/legacy/libvdrtools/src/domain/cache.rs similarity index 100% rename from libvdrtools/src/domain/cache.rs rename to aries/legacy/libvdrtools/src/domain/cache.rs diff --git a/libvdrtools/src/domain/crypto/did.rs b/aries/legacy/libvdrtools/src/domain/crypto/did.rs similarity index 100% rename from libvdrtools/src/domain/crypto/did.rs rename to aries/legacy/libvdrtools/src/domain/crypto/did.rs diff --git a/libvdrtools/src/domain/crypto/key.rs b/aries/legacy/libvdrtools/src/domain/crypto/key.rs similarity index 100% rename from libvdrtools/src/domain/crypto/key.rs rename to aries/legacy/libvdrtools/src/domain/crypto/key.rs diff --git a/libvdrtools/src/domain/crypto/mod.rs b/aries/legacy/libvdrtools/src/domain/crypto/mod.rs similarity index 100% rename from libvdrtools/src/domain/crypto/mod.rs rename to aries/legacy/libvdrtools/src/domain/crypto/mod.rs diff --git a/libvdrtools/src/domain/crypto/pack.rs b/aries/legacy/libvdrtools/src/domain/crypto/pack.rs similarity index 100% rename from libvdrtools/src/domain/crypto/pack.rs rename to aries/legacy/libvdrtools/src/domain/crypto/pack.rs diff --git a/libvdrtools/src/domain/mod.rs b/aries/legacy/libvdrtools/src/domain/mod.rs similarity index 100% rename from libvdrtools/src/domain/mod.rs rename to aries/legacy/libvdrtools/src/domain/mod.rs diff --git a/libvdrtools/src/lib.rs b/aries/legacy/libvdrtools/src/lib.rs similarity index 95% rename from libvdrtools/src/lib.rs rename to aries/legacy/libvdrtools/src/lib.rs index 3221fee2a3..d8e22c6bb2 100644 --- a/libvdrtools/src/lib.rs +++ b/aries/legacy/libvdrtools/src/lib.rs @@ -86,9 +86,8 @@ impl Locator { let did_controller = DidController::new(wallet_service.clone(), crypto_service.clone()); - let wallet_controller = - WalletController::new(wallet_service.clone(), crypto_service.clone()); - let non_secret_controller = NonSecretsController::new(wallet_service.clone()); + let wallet_controller = WalletController::new(wallet_service.clone(), crypto_service); + let non_secret_controller = NonSecretsController::new(wallet_service); let res = Locator { crypto_controller, diff --git a/libvdrtools/src/services/crypto/ed25519.rs b/aries/legacy/libvdrtools/src/services/crypto/ed25519.rs similarity index 100% rename from libvdrtools/src/services/crypto/ed25519.rs rename to aries/legacy/libvdrtools/src/services/crypto/ed25519.rs diff --git a/libvdrtools/src/services/crypto/mod.rs b/aries/legacy/libvdrtools/src/services/crypto/mod.rs similarity index 100% rename from libvdrtools/src/services/crypto/mod.rs rename to aries/legacy/libvdrtools/src/services/crypto/mod.rs diff --git a/libvdrtools/src/services/mod.rs b/aries/legacy/libvdrtools/src/services/mod.rs similarity index 100% rename from libvdrtools/src/services/mod.rs rename to aries/legacy/libvdrtools/src/services/mod.rs diff --git a/libvdrtools/src/services/wallet.rs b/aries/legacy/libvdrtools/src/services/wallet.rs similarity index 100% rename from libvdrtools/src/services/wallet.rs rename to aries/legacy/libvdrtools/src/services/wallet.rs diff --git a/libvdrtools/src/utils/crypto/base58.rs b/aries/legacy/libvdrtools/src/utils/crypto/base58.rs similarity index 100% rename from libvdrtools/src/utils/crypto/base58.rs rename to aries/legacy/libvdrtools/src/utils/crypto/base58.rs diff --git a/libvdrtools/src/utils/crypto/mod.rs b/aries/legacy/libvdrtools/src/utils/crypto/mod.rs similarity index 100% rename from libvdrtools/src/utils/crypto/mod.rs rename to aries/legacy/libvdrtools/src/utils/crypto/mod.rs diff --git a/libvdrtools/src/utils/crypto/verkey_builder.rs b/aries/legacy/libvdrtools/src/utils/crypto/verkey_builder.rs similarity index 100% rename from libvdrtools/src/utils/crypto/verkey_builder.rs rename to aries/legacy/libvdrtools/src/utils/crypto/verkey_builder.rs diff --git a/libvdrtools/src/utils/mod.rs b/aries/legacy/libvdrtools/src/utils/mod.rs similarity index 100% rename from libvdrtools/src/utils/mod.rs rename to aries/legacy/libvdrtools/src/utils/mod.rs diff --git a/libvdrtools/src/utils/qualifier.rs b/aries/legacy/libvdrtools/src/utils/qualifier.rs similarity index 100% rename from libvdrtools/src/utils/qualifier.rs rename to aries/legacy/libvdrtools/src/utils/qualifier.rs diff --git a/shared_vcx/Cargo.toml b/aries/shared/Cargo.toml similarity index 94% rename from shared_vcx/Cargo.toml rename to aries/shared/Cargo.toml index 6de01bc798..20f63b14cb 100644 --- a/shared_vcx/Cargo.toml +++ b/aries/shared/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "shared_vcx" +name = "shared" edition.workspace = true version.workspace = true authors.workspace = true diff --git a/shared_vcx/src/errors/http_error.rs b/aries/shared/src/errors/http_error.rs similarity index 100% rename from shared_vcx/src/errors/http_error.rs rename to aries/shared/src/errors/http_error.rs diff --git a/shared_vcx/src/errors/mod.rs b/aries/shared/src/errors/mod.rs similarity index 100% rename from shared_vcx/src/errors/mod.rs rename to aries/shared/src/errors/mod.rs diff --git a/shared_vcx/src/errors/validation.rs b/aries/shared/src/errors/validation.rs similarity index 100% rename from shared_vcx/src/errors/validation.rs rename to aries/shared/src/errors/validation.rs diff --git a/shared_vcx/src/http_client.rs b/aries/shared/src/http_client.rs similarity index 100% rename from shared_vcx/src/http_client.rs rename to aries/shared/src/http_client.rs diff --git a/shared_vcx/src/lib.rs b/aries/shared/src/lib.rs similarity index 100% rename from shared_vcx/src/lib.rs rename to aries/shared/src/lib.rs diff --git a/shared_vcx/src/maybe_known.rs b/aries/shared/src/maybe_known.rs similarity index 100% rename from shared_vcx/src/maybe_known.rs rename to aries/shared/src/maybe_known.rs diff --git a/shared_vcx/src/misc/mod.rs b/aries/shared/src/misc/mod.rs similarity index 100% rename from shared_vcx/src/misc/mod.rs rename to aries/shared/src/misc/mod.rs diff --git a/shared_vcx/src/misc/serde_ignored.rs b/aries/shared/src/misc/serde_ignored.rs similarity index 100% rename from shared_vcx/src/misc/serde_ignored.rs rename to aries/shared/src/misc/serde_ignored.rs diff --git a/shared_vcx/src/misc/utils.rs b/aries/shared/src/misc/utils.rs similarity index 100% rename from shared_vcx/src/misc/utils.rs rename to aries/shared/src/misc/utils.rs diff --git a/shared_vcx/src/validation/did.rs b/aries/shared/src/validation/did.rs similarity index 100% rename from shared_vcx/src/validation/did.rs rename to aries/shared/src/validation/did.rs diff --git a/shared_vcx/src/validation/mod.rs b/aries/shared/src/validation/mod.rs similarity index 100% rename from shared_vcx/src/validation/mod.rs rename to aries/shared/src/validation/mod.rs diff --git a/shared_vcx/src/validation/verkey.rs b/aries/shared/src/validation/verkey.rs similarity index 100% rename from shared_vcx/src/validation/verkey.rs rename to aries/shared/src/validation/verkey.rs diff --git a/wrappers/node/.eslintignore b/aries/wrappers/node/.eslintignore similarity index 100% rename from wrappers/node/.eslintignore rename to aries/wrappers/node/.eslintignore diff --git a/wrappers/node/.eslintrc.js b/aries/wrappers/node/.eslintrc.js similarity index 100% rename from wrappers/node/.eslintrc.js rename to aries/wrappers/node/.eslintrc.js diff --git a/wrappers/node/.gitignore b/aries/wrappers/node/.gitignore similarity index 100% rename from wrappers/node/.gitignore rename to aries/wrappers/node/.gitignore diff --git a/wrappers/node/.npmignore b/aries/wrappers/node/.npmignore similarity index 100% rename from wrappers/node/.npmignore rename to aries/wrappers/node/.npmignore diff --git a/wrappers/node/.prettierrc.js b/aries/wrappers/node/.prettierrc.js similarity index 100% rename from wrappers/node/.prettierrc.js rename to aries/wrappers/node/.prettierrc.js diff --git a/wrappers/node/README.md b/aries/wrappers/node/README.md similarity index 100% rename from wrappers/node/README.md rename to aries/wrappers/node/README.md diff --git a/wrappers/node/ci/generate-docs.sh b/aries/wrappers/node/ci/generate-docs.sh similarity index 100% rename from wrappers/node/ci/generate-docs.sh rename to aries/wrappers/node/ci/generate-docs.sh diff --git a/wrappers/node/ci/node.dockerfile b/aries/wrappers/node/ci/node.dockerfile similarity index 76% rename from wrappers/node/ci/node.dockerfile rename to aries/wrappers/node/ci/node.dockerfile index 79a70e6035..02d54db33e 100644 --- a/wrappers/node/ci/node.dockerfile +++ b/aries/wrappers/node/ci/node.dockerfile @@ -1,11 +1,11 @@ -# Development +# Development FROM libindy ARG uid=1000 RUN useradd -ms /bin/bash -u $uid node -WORKDIR vcx/wrappers/node +WORKDIR vcx/aries/wrappers/node # Assumes we are in the ./vcx directory RUN npm i npm@6.1.0 COPY vcx/libvcx/target/debian/*.deb . RUN dpkg -i *.deb -USER node \ No newline at end of file +USER node diff --git a/wrappers/node/ci/package.sh b/aries/wrappers/node/ci/package.sh similarity index 92% rename from wrappers/node/ci/package.sh rename to aries/wrappers/node/ci/package.sh index 786b91d921..c77d4b7ed5 100755 --- a/wrappers/node/ci/package.sh +++ b/aries/wrappers/node/ci/package.sh @@ -1,6 +1,6 @@ export PATH=${PATH}:$(pwd)/vcx/ci/scripts OUTPUTDIR=output -DIR=vcx/wrappers/node +DIR=vcx/aries/wrappers/node CURDIR=$(pwd) cd $DIR npm i diff --git a/wrappers/node/ci/test-and-package.sh b/aries/wrappers/node/ci/test-and-package.sh similarity index 100% rename from wrappers/node/ci/test-and-package.sh rename to aries/wrappers/node/ci/test-and-package.sh diff --git a/wrappers/node/ci/test.sh b/aries/wrappers/node/ci/test.sh similarity index 53% rename from wrappers/node/ci/test.sh rename to aries/wrappers/node/ci/test.sh index 4e433021b6..e427e4fac1 100755 --- a/wrappers/node/ci/test.sh +++ b/aries/wrappers/node/ci/test.sh @@ -1,7 +1,7 @@ #!/bin/bash -cd vcx/wrappers/node/ +cd vcx/aries/wrappers/node/ npm i npm run lint npm run compile npm test -npm run test-logging \ No newline at end of file +npm run test-logging diff --git a/wrappers/node/ci/test_wrapper.sh b/aries/wrappers/node/ci/test_wrapper.sh similarity index 100% rename from wrappers/node/ci/test_wrapper.sh rename to aries/wrappers/node/ci/test_wrapper.sh diff --git a/wrappers/node/notification-server.js b/aries/wrappers/node/notification-server.js similarity index 100% rename from wrappers/node/notification-server.js rename to aries/wrappers/node/notification-server.js diff --git a/wrappers/node/package-lock.json b/aries/wrappers/node/package-lock.json similarity index 100% rename from wrappers/node/package-lock.json rename to aries/wrappers/node/package-lock.json diff --git a/wrappers/node/package.json b/aries/wrappers/node/package.json similarity index 100% rename from wrappers/node/package.json rename to aries/wrappers/node/package.json diff --git a/wrappers/node/publish.sh b/aries/wrappers/node/publish.sh similarity index 100% rename from wrappers/node/publish.sh rename to aries/wrappers/node/publish.sh diff --git a/wrappers/node/resources/localhost.txn b/aries/wrappers/node/resources/localhost.txn similarity index 100% rename from wrappers/node/resources/localhost.txn rename to aries/wrappers/node/resources/localhost.txn diff --git a/wrappers/node/src/api/common.ts b/aries/wrappers/node/src/api/common.ts similarity index 100% rename from wrappers/node/src/api/common.ts rename to aries/wrappers/node/src/api/common.ts diff --git a/wrappers/node/src/api/connection.ts b/aries/wrappers/node/src/api/connection.ts similarity index 100% rename from wrappers/node/src/api/connection.ts rename to aries/wrappers/node/src/api/connection.ts diff --git a/wrappers/node/src/api/credential-def.ts b/aries/wrappers/node/src/api/credential-def.ts similarity index 100% rename from wrappers/node/src/api/credential-def.ts rename to aries/wrappers/node/src/api/credential-def.ts diff --git a/wrappers/node/src/api/credential.ts b/aries/wrappers/node/src/api/credential.ts similarity index 100% rename from wrappers/node/src/api/credential.ts rename to aries/wrappers/node/src/api/credential.ts diff --git a/wrappers/node/src/api/disclosed-proof.ts b/aries/wrappers/node/src/api/disclosed-proof.ts similarity index 100% rename from wrappers/node/src/api/disclosed-proof.ts rename to aries/wrappers/node/src/api/disclosed-proof.ts diff --git a/wrappers/node/src/api/init.ts b/aries/wrappers/node/src/api/init.ts similarity index 100% rename from wrappers/node/src/api/init.ts rename to aries/wrappers/node/src/api/init.ts diff --git a/wrappers/node/src/api/issuer-credential.ts b/aries/wrappers/node/src/api/issuer-credential.ts similarity index 100% rename from wrappers/node/src/api/issuer-credential.ts rename to aries/wrappers/node/src/api/issuer-credential.ts diff --git a/wrappers/node/src/api/logging.ts b/aries/wrappers/node/src/api/logging.ts similarity index 100% rename from wrappers/node/src/api/logging.ts rename to aries/wrappers/node/src/api/logging.ts diff --git a/wrappers/node/src/api/mediated-connection.ts b/aries/wrappers/node/src/api/mediated-connection.ts similarity index 100% rename from wrappers/node/src/api/mediated-connection.ts rename to aries/wrappers/node/src/api/mediated-connection.ts diff --git a/wrappers/node/src/api/out-of-band-receiver.ts b/aries/wrappers/node/src/api/out-of-band-receiver.ts similarity index 100% rename from wrappers/node/src/api/out-of-band-receiver.ts rename to aries/wrappers/node/src/api/out-of-band-receiver.ts diff --git a/wrappers/node/src/api/out-of-band-sender.ts b/aries/wrappers/node/src/api/out-of-band-sender.ts similarity index 100% rename from wrappers/node/src/api/out-of-band-sender.ts rename to aries/wrappers/node/src/api/out-of-band-sender.ts diff --git a/wrappers/node/src/api/out-of-band.ts b/aries/wrappers/node/src/api/out-of-band.ts similarity index 100% rename from wrappers/node/src/api/out-of-band.ts rename to aries/wrappers/node/src/api/out-of-band.ts diff --git a/wrappers/node/src/api/proof.ts b/aries/wrappers/node/src/api/proof.ts similarity index 100% rename from wrappers/node/src/api/proof.ts rename to aries/wrappers/node/src/api/proof.ts diff --git a/wrappers/node/src/api/revocation-registry.ts b/aries/wrappers/node/src/api/revocation-registry.ts similarity index 100% rename from wrappers/node/src/api/revocation-registry.ts rename to aries/wrappers/node/src/api/revocation-registry.ts diff --git a/wrappers/node/src/api/schema.ts b/aries/wrappers/node/src/api/schema.ts similarity index 100% rename from wrappers/node/src/api/schema.ts rename to aries/wrappers/node/src/api/schema.ts diff --git a/wrappers/node/src/api/trustping.ts b/aries/wrappers/node/src/api/trustping.ts similarity index 100% rename from wrappers/node/src/api/trustping.ts rename to aries/wrappers/node/src/api/trustping.ts diff --git a/wrappers/node/src/api/utils.ts b/aries/wrappers/node/src/api/utils.ts similarity index 100% rename from wrappers/node/src/api/utils.ts rename to aries/wrappers/node/src/api/utils.ts diff --git a/wrappers/node/src/api/vcx-base-with-state.ts b/aries/wrappers/node/src/api/vcx-base-with-state.ts similarity index 100% rename from wrappers/node/src/api/vcx-base-with-state.ts rename to aries/wrappers/node/src/api/vcx-base-with-state.ts diff --git a/wrappers/node/src/api/vcx-base.ts b/aries/wrappers/node/src/api/vcx-base.ts similarity index 100% rename from wrappers/node/src/api/vcx-base.ts rename to aries/wrappers/node/src/api/vcx-base.ts diff --git a/wrappers/node/src/api/vcx-mock.ts b/aries/wrappers/node/src/api/vcx-mock.ts similarity index 100% rename from wrappers/node/src/api/vcx-mock.ts rename to aries/wrappers/node/src/api/vcx-mock.ts diff --git a/wrappers/node/src/api/wallet.ts b/aries/wrappers/node/src/api/wallet.ts similarity index 100% rename from wrappers/node/src/api/wallet.ts rename to aries/wrappers/node/src/api/wallet.ts diff --git a/wrappers/node/src/errors.ts b/aries/wrappers/node/src/errors.ts similarity index 100% rename from wrappers/node/src/errors.ts rename to aries/wrappers/node/src/errors.ts diff --git a/wrappers/node/src/index.ts b/aries/wrappers/node/src/index.ts similarity index 100% rename from wrappers/node/src/index.ts rename to aries/wrappers/node/src/index.ts diff --git a/wrappers/node/src/rustlib.ts b/aries/wrappers/node/src/rustlib.ts similarity index 100% rename from wrappers/node/src/rustlib.ts rename to aries/wrappers/node/src/rustlib.ts diff --git a/wrappers/node/src/utils/gc-watcher.ts b/aries/wrappers/node/src/utils/gc-watcher.ts similarity index 100% rename from wrappers/node/src/utils/gc-watcher.ts rename to aries/wrappers/node/src/utils/gc-watcher.ts diff --git a/wrappers/node/test/.eslintrc.js b/aries/wrappers/node/test/.eslintrc.js similarity index 100% rename from wrappers/node/test/.eslintrc.js rename to aries/wrappers/node/test/.eslintrc.js diff --git a/wrappers/node/test/helpers/entities.ts b/aries/wrappers/node/test/helpers/entities.ts similarity index 100% rename from wrappers/node/test/helpers/entities.ts rename to aries/wrappers/node/test/helpers/entities.ts diff --git a/wrappers/node/test/helpers/mockdata.ts b/aries/wrappers/node/test/helpers/mockdata.ts similarity index 100% rename from wrappers/node/test/helpers/mockdata.ts rename to aries/wrappers/node/test/helpers/mockdata.ts diff --git a/wrappers/node/test/helpers/utils.ts b/aries/wrappers/node/test/helpers/utils.ts similarity index 100% rename from wrappers/node/test/helpers/utils.ts rename to aries/wrappers/node/test/helpers/utils.ts diff --git a/wrappers/node/test/integration/ledger.test.ts b/aries/wrappers/node/test/integration/ledger.test.ts similarity index 100% rename from wrappers/node/test/integration/ledger.test.ts rename to aries/wrappers/node/test/integration/ledger.test.ts diff --git a/wrappers/node/test/module-resolver-helper.ts b/aries/wrappers/node/test/module-resolver-helper.ts similarity index 100% rename from wrappers/node/test/module-resolver-helper.ts rename to aries/wrappers/node/test/module-resolver-helper.ts diff --git a/wrappers/node/test/suite1/ariesvcx-connection.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-connection.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-connection.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-connection.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-credential-def.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-credential-def.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-credential-def.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-credential-def.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-credential.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-credential.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-credential.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-credential.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-disclosed-proof.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-disclosed-proof.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-disclosed-proof.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-disclosed-proof.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-issuer-credential.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-issuer-credential.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-issuer-credential.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-issuer-credential.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-mediated-connection.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-mediated-connection.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-mediated-connection.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-mediated-connection.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-oob.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-oob.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-oob.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-oob.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-proof.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-proof.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-proof.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-proof.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-schema.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-schema.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-schema.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-schema.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-utils.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-utils.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-utils.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-utils.test.ts diff --git a/wrappers/node/test/suite1/ariesvcx-wallet.test.ts b/aries/wrappers/node/test/suite1/ariesvcx-wallet.test.ts similarity index 100% rename from wrappers/node/test/suite1/ariesvcx-wallet.test.ts rename to aries/wrappers/node/test/suite1/ariesvcx-wallet.test.ts diff --git a/wrappers/node/test/tsconfig.json b/aries/wrappers/node/test/tsconfig.json similarity index 100% rename from wrappers/node/test/tsconfig.json rename to aries/wrappers/node/test/tsconfig.json diff --git a/wrappers/node/tsconfig.json b/aries/wrappers/node/tsconfig.json similarity index 100% rename from wrappers/node/tsconfig.json rename to aries/wrappers/node/tsconfig.json diff --git a/wrappers/vcx-napi-rs/Cargo.toml b/aries/wrappers/vcx-napi-rs/Cargo.toml similarity index 74% rename from wrappers/vcx-napi-rs/Cargo.toml rename to aries/wrappers/vcx-napi-rs/Cargo.toml index 9f73868fe5..a62fdd5f19 100644 --- a/wrappers/vcx-napi-rs/Cargo.toml +++ b/aries/wrappers/vcx-napi-rs/Cargo.toml @@ -12,14 +12,14 @@ crate-type = ["cdylib"] doctest = false [dependencies] -libvcx_core = { path = "../../libvcx_core" } -wallet_migrator = { path = "../../wallet_migrator" } +libvcx_core = { path = "../../legacy/libvcx_core" } +wallet_migrator = { path = "../../../tools/wallet_migrator" } log = "0.4.16" napi = { version = "2.10.14", default-features = false, features = [ "async" ] } napi-derive = { version = "2.10.1" } uuid = { version = "1.5.0", default-features = false, features = ["v4"] } chrono = "0.4.23" -libvcx_logger = { path = "../../tools/libvcx_logger" } +libvcx_logger = { path = "../../../tools/libvcx_logger" } [build-dependencies] napi-build = "2.0.1" diff --git a/wrappers/vcx-napi-rs/alpine.Dockerfile b/aries/wrappers/vcx-napi-rs/alpine.Dockerfile similarity index 100% rename from wrappers/vcx-napi-rs/alpine.Dockerfile rename to aries/wrappers/vcx-napi-rs/alpine.Dockerfile diff --git a/wrappers/vcx-napi-rs/build.rs b/aries/wrappers/vcx-napi-rs/build.rs similarity index 100% rename from wrappers/vcx-napi-rs/build.rs rename to aries/wrappers/vcx-napi-rs/build.rs diff --git a/wrappers/vcx-napi-rs/debian.Dockerfile b/aries/wrappers/vcx-napi-rs/debian.Dockerfile similarity index 100% rename from wrappers/vcx-napi-rs/debian.Dockerfile rename to aries/wrappers/vcx-napi-rs/debian.Dockerfile diff --git a/wrappers/vcx-napi-rs/index.d.ts b/aries/wrappers/vcx-napi-rs/index.d.ts similarity index 100% rename from wrappers/vcx-napi-rs/index.d.ts rename to aries/wrappers/vcx-napi-rs/index.d.ts diff --git a/wrappers/vcx-napi-rs/index.js b/aries/wrappers/vcx-napi-rs/index.js similarity index 100% rename from wrappers/vcx-napi-rs/index.js rename to aries/wrappers/vcx-napi-rs/index.js diff --git a/wrappers/vcx-napi-rs/npm/darwin-arm64/README.md b/aries/wrappers/vcx-napi-rs/npm/darwin-arm64/README.md similarity index 100% rename from wrappers/vcx-napi-rs/npm/darwin-arm64/README.md rename to aries/wrappers/vcx-napi-rs/npm/darwin-arm64/README.md diff --git a/wrappers/vcx-napi-rs/npm/darwin-arm64/package.json b/aries/wrappers/vcx-napi-rs/npm/darwin-arm64/package.json similarity index 100% rename from wrappers/vcx-napi-rs/npm/darwin-arm64/package.json rename to aries/wrappers/vcx-napi-rs/npm/darwin-arm64/package.json diff --git a/wrappers/vcx-napi-rs/npm/darwin-x64/README.md b/aries/wrappers/vcx-napi-rs/npm/darwin-x64/README.md similarity index 100% rename from wrappers/vcx-napi-rs/npm/darwin-x64/README.md rename to aries/wrappers/vcx-napi-rs/npm/darwin-x64/README.md diff --git a/wrappers/vcx-napi-rs/npm/darwin-x64/package.json b/aries/wrappers/vcx-napi-rs/npm/darwin-x64/package.json similarity index 100% rename from wrappers/vcx-napi-rs/npm/darwin-x64/package.json rename to aries/wrappers/vcx-napi-rs/npm/darwin-x64/package.json diff --git a/wrappers/vcx-napi-rs/npm/linux-x64-gnu/README.md b/aries/wrappers/vcx-napi-rs/npm/linux-x64-gnu/README.md similarity index 100% rename from wrappers/vcx-napi-rs/npm/linux-x64-gnu/README.md rename to aries/wrappers/vcx-napi-rs/npm/linux-x64-gnu/README.md diff --git a/wrappers/vcx-napi-rs/npm/linux-x64-gnu/package.json b/aries/wrappers/vcx-napi-rs/npm/linux-x64-gnu/package.json similarity index 100% rename from wrappers/vcx-napi-rs/npm/linux-x64-gnu/package.json rename to aries/wrappers/vcx-napi-rs/npm/linux-x64-gnu/package.json diff --git a/wrappers/vcx-napi-rs/npm/linux-x64-musl/README.md b/aries/wrappers/vcx-napi-rs/npm/linux-x64-musl/README.md similarity index 100% rename from wrappers/vcx-napi-rs/npm/linux-x64-musl/README.md rename to aries/wrappers/vcx-napi-rs/npm/linux-x64-musl/README.md diff --git a/wrappers/vcx-napi-rs/npm/linux-x64-musl/package.json b/aries/wrappers/vcx-napi-rs/npm/linux-x64-musl/package.json similarity index 100% rename from wrappers/vcx-napi-rs/npm/linux-x64-musl/package.json rename to aries/wrappers/vcx-napi-rs/npm/linux-x64-musl/package.json diff --git a/wrappers/vcx-napi-rs/package-lock.json b/aries/wrappers/vcx-napi-rs/package-lock.json similarity index 100% rename from wrappers/vcx-napi-rs/package-lock.json rename to aries/wrappers/vcx-napi-rs/package-lock.json diff --git a/wrappers/vcx-napi-rs/package.json b/aries/wrappers/vcx-napi-rs/package.json similarity index 100% rename from wrappers/vcx-napi-rs/package.json rename to aries/wrappers/vcx-napi-rs/package.json diff --git a/wrappers/vcx-napi-rs/src/api/agency_client.rs b/aries/wrappers/vcx-napi-rs/src/api/agency_client.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/agency_client.rs rename to aries/wrappers/vcx-napi-rs/src/api/agency_client.rs diff --git a/wrappers/vcx-napi-rs/src/api/agent.rs b/aries/wrappers/vcx-napi-rs/src/api/agent.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/agent.rs rename to aries/wrappers/vcx-napi-rs/src/api/agent.rs diff --git a/wrappers/vcx-napi-rs/src/api/connection.rs b/aries/wrappers/vcx-napi-rs/src/api/connection.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/connection.rs rename to aries/wrappers/vcx-napi-rs/src/api/connection.rs diff --git a/wrappers/vcx-napi-rs/src/api/credential.rs b/aries/wrappers/vcx-napi-rs/src/api/credential.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/credential.rs rename to aries/wrappers/vcx-napi-rs/src/api/credential.rs diff --git a/wrappers/vcx-napi-rs/src/api/credential_definition.rs b/aries/wrappers/vcx-napi-rs/src/api/credential_definition.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/credential_definition.rs rename to aries/wrappers/vcx-napi-rs/src/api/credential_definition.rs diff --git a/wrappers/vcx-napi-rs/src/api/disclosed_proof.rs b/aries/wrappers/vcx-napi-rs/src/api/disclosed_proof.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/disclosed_proof.rs rename to aries/wrappers/vcx-napi-rs/src/api/disclosed_proof.rs diff --git a/wrappers/vcx-napi-rs/src/api/issuer_credential.rs b/aries/wrappers/vcx-napi-rs/src/api/issuer_credential.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/issuer_credential.rs rename to aries/wrappers/vcx-napi-rs/src/api/issuer_credential.rs diff --git a/wrappers/vcx-napi-rs/src/api/ledger.rs b/aries/wrappers/vcx-napi-rs/src/api/ledger.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/ledger.rs rename to aries/wrappers/vcx-napi-rs/src/api/ledger.rs diff --git a/wrappers/vcx-napi-rs/src/api/logging.rs b/aries/wrappers/vcx-napi-rs/src/api/logging.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/logging.rs rename to aries/wrappers/vcx-napi-rs/src/api/logging.rs diff --git a/wrappers/vcx-napi-rs/src/api/mediated_connection.rs b/aries/wrappers/vcx-napi-rs/src/api/mediated_connection.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/mediated_connection.rs rename to aries/wrappers/vcx-napi-rs/src/api/mediated_connection.rs diff --git a/wrappers/vcx-napi-rs/src/api/mod.rs b/aries/wrappers/vcx-napi-rs/src/api/mod.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/mod.rs rename to aries/wrappers/vcx-napi-rs/src/api/mod.rs diff --git a/wrappers/vcx-napi-rs/src/api/out_of_band.rs b/aries/wrappers/vcx-napi-rs/src/api/out_of_band.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/out_of_band.rs rename to aries/wrappers/vcx-napi-rs/src/api/out_of_band.rs diff --git a/wrappers/vcx-napi-rs/src/api/out_of_band_receiver.rs b/aries/wrappers/vcx-napi-rs/src/api/out_of_band_receiver.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/out_of_band_receiver.rs rename to aries/wrappers/vcx-napi-rs/src/api/out_of_band_receiver.rs diff --git a/wrappers/vcx-napi-rs/src/api/out_of_band_sender.rs b/aries/wrappers/vcx-napi-rs/src/api/out_of_band_sender.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/out_of_band_sender.rs rename to aries/wrappers/vcx-napi-rs/src/api/out_of_band_sender.rs diff --git a/wrappers/vcx-napi-rs/src/api/pool.rs b/aries/wrappers/vcx-napi-rs/src/api/pool.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/pool.rs rename to aries/wrappers/vcx-napi-rs/src/api/pool.rs diff --git a/wrappers/vcx-napi-rs/src/api/proof.rs b/aries/wrappers/vcx-napi-rs/src/api/proof.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/proof.rs rename to aries/wrappers/vcx-napi-rs/src/api/proof.rs diff --git a/wrappers/vcx-napi-rs/src/api/revocation_registry.rs b/aries/wrappers/vcx-napi-rs/src/api/revocation_registry.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/revocation_registry.rs rename to aries/wrappers/vcx-napi-rs/src/api/revocation_registry.rs diff --git a/wrappers/vcx-napi-rs/src/api/schema.rs b/aries/wrappers/vcx-napi-rs/src/api/schema.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/schema.rs rename to aries/wrappers/vcx-napi-rs/src/api/schema.rs diff --git a/wrappers/vcx-napi-rs/src/api/trustping.rs b/aries/wrappers/vcx-napi-rs/src/api/trustping.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/trustping.rs rename to aries/wrappers/vcx-napi-rs/src/api/trustping.rs diff --git a/wrappers/vcx-napi-rs/src/api/utils.rs b/aries/wrappers/vcx-napi-rs/src/api/utils.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/utils.rs rename to aries/wrappers/vcx-napi-rs/src/api/utils.rs diff --git a/wrappers/vcx-napi-rs/src/api/wallet.rs b/aries/wrappers/vcx-napi-rs/src/api/wallet.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/api/wallet.rs rename to aries/wrappers/vcx-napi-rs/src/api/wallet.rs diff --git a/wrappers/vcx-napi-rs/src/error.rs b/aries/wrappers/vcx-napi-rs/src/error.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/error.rs rename to aries/wrappers/vcx-napi-rs/src/error.rs diff --git a/wrappers/vcx-napi-rs/src/lib.rs b/aries/wrappers/vcx-napi-rs/src/lib.rs similarity index 100% rename from wrappers/vcx-napi-rs/src/lib.rs rename to aries/wrappers/vcx-napi-rs/src/lib.rs diff --git a/wrappers/vcx-napi-rs/tsconfig.json b/aries/wrappers/vcx-napi-rs/tsconfig.json similarity index 100% rename from wrappers/vcx-napi-rs/tsconfig.json rename to aries/wrappers/vcx-napi-rs/tsconfig.json diff --git a/aries_vcx/Cargo.toml b/aries_vcx/Cargo.toml index 703a53d4c7..9a1dee02ed 100644 --- a/aries_vcx/Cargo.toml +++ b/aries_vcx/Cargo.toml @@ -33,11 +33,11 @@ backtrace_errors = ["backtrace"] legacy_proof = ["aries_vcx_core/legacy_proof"] [dependencies] -agency_client = { path = "../agency_client" } +agency_client = { path = "../aries/legacy/agency_client" } messages = { path = "../messages" } -diddoc_legacy = { path = "../diddoc_legacy" } +diddoc_legacy = { path = "../aries/legacy/diddoc_legacy" } aries_vcx_core = { path = "../aries_vcx_core" } -shared_vcx = { path = "../shared_vcx" } +shared = { path = "../aries/shared" } bs58 = "0.5.0" async-trait = "0.1.53" env_logger = "0.10.0" @@ -66,6 +66,6 @@ backtrace = { optional = true, version = "0.3" } [dev-dependencies] test_utils = { path = "../tools/test_utils" } libvcx_logger = { path = "../tools/libvcx_logger" } -wallet_migrator = { path = "../wallet_migrator" } +wallet_migrator = { path = "../tools/wallet_migrator" } async-channel = "1.7.1" tokio = { version = "1.20", features = ["rt", "macros", "rt-multi-thread"] } diff --git a/aries_vcx/README.md b/aries_vcx/README.md index 4317920549..61fb8873da 100644 --- a/aries_vcx/README.md +++ b/aries_vcx/README.md @@ -25,7 +25,7 @@ It's also advisable to follow these [instructions](TUTORIAL.md) to check your en # Projects built with aries-vcx - [mediator](../agents/rust/mediator) - Message mediator web service, useful for mobile device to receive messages while the device is offline. - [unifii_aries_vcx](../uniffi_aries_vcx) - Mobile wrapper to autogenerate Swift and Kotlin wrappers. Also comes with sample native mobile app. -- [aries-vcx-agent](../agents/rust/aries-vcx-agent) - Sample agent framework adding persistence and message matching on top of `aries_vcx`. Used for cross-compatibility testing with other aries implementations. +- [aries-vcx-agent](../aries/agents/rust/aries-vcx-agent) - Sample agent framework adding persistence and message matching on top of `aries_vcx`. Used for cross-compatibility testing with other aries implementations. ## Implemented Aries protocols * ✅ Connection Protocol 1.0: [`https://didcomm.org/connections/1.0/*`](https://github.com/hyperledger/aries-rfcs/tree/master/features/0160-connection-protocol) diff --git a/aries_vcx/src/errors/mapping_others.rs b/aries_vcx/src/errors/mapping_others.rs index e680391d7e..db80a17315 100644 --- a/aries_vcx/src/errors/mapping_others.rs +++ b/aries_vcx/src/errors/mapping_others.rs @@ -1,7 +1,7 @@ use std::sync::PoisonError; use aries_vcx_core::errors::error::{AriesVcxCoreError, AriesVcxCoreErrorKind}; -use shared_vcx::errors::http_error::HttpError; +use shared::errors::http_error::HttpError; use crate::{ errors::error::{AriesVcxError, AriesVcxErrorKind}, diff --git a/aries_vcx/src/handlers/mediated_connection/util.rs b/aries_vcx/src/handlers/mediated_connection/util.rs index 34862bcaad..0bc113e5a4 100644 --- a/aries_vcx/src/handlers/mediated_connection/util.rs +++ b/aries_vcx/src/handlers/mediated_connection/util.rs @@ -1,7 +1,7 @@ use aries_vcx_core::wallet::base_wallet::BaseWallet; use diddoc_legacy::aries::diddoc::AriesDidDoc; use messages::AriesMessage; -use shared_vcx::http_client::post_message; +use shared::http_client::post_message; use crate::{ errors::error::{AriesVcxError, AriesVcxErrorKind, VcxResult}, diff --git a/aries_vcx/src/handlers/out_of_band/sender.rs b/aries_vcx/src/handlers/out_of_band/sender.rs index 3c50b2141c..bf0e6a2d7b 100644 --- a/aries_vcx/src/handlers/out_of_band/sender.rs +++ b/aries_vcx/src/handlers/out_of_band/sender.rs @@ -12,7 +12,7 @@ use messages::{ msg_types::Protocol, AriesMessage, }; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use uuid::Uuid; use crate::{ diff --git a/aries_vcx/src/protocols/revocation_notification/mod.rs b/aries_vcx/src/protocols/revocation_notification/mod.rs index 064080f0e8..6ef6c9cd9d 100644 --- a/aries_vcx/src/protocols/revocation_notification/mod.rs +++ b/aries_vcx/src/protocols/revocation_notification/mod.rs @@ -10,7 +10,7 @@ pub mod test_utils { }, AriesMessage, }; - use shared_vcx::maybe_known::MaybeKnown; + use shared::maybe_known::MaybeKnown; use test_utils::constants::REV_REG_ID; use uuid::Uuid; diff --git a/aries_vcx/src/protocols/revocation_notification/receiver/state_machine.rs b/aries_vcx/src/protocols/revocation_notification/receiver/state_machine.rs index e33d6832f8..aa1ca08000 100644 --- a/aries_vcx/src/protocols/revocation_notification/receiver/state_machine.rs +++ b/aries_vcx/src/protocols/revocation_notification/receiver/state_machine.rs @@ -9,7 +9,7 @@ use messages::{ }, }, }; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use uuid::Uuid; use crate::{ diff --git a/aries_vcx/src/protocols/revocation_notification/sender/state_machine.rs b/aries_vcx/src/protocols/revocation_notification/sender/state_machine.rs index 6b12826ae1..f8e0e41654 100644 --- a/aries_vcx/src/protocols/revocation_notification/sender/state_machine.rs +++ b/aries_vcx/src/protocols/revocation_notification/sender/state_machine.rs @@ -5,7 +5,7 @@ use messages::{ revoke::{RevocationFormat, Revoke, RevokeContent, RevokeDecorators}, }, }; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use uuid::Uuid; use crate::{ diff --git a/aries_vcx/tests/utils/scenarios/credential_issuance.rs b/aries_vcx/tests/utils/scenarios/credential_issuance.rs index 78d4c2f7d8..376f184933 100644 --- a/aries_vcx/tests/utils/scenarios/credential_issuance.rs +++ b/aries_vcx/tests/utils/scenarios/credential_issuance.rs @@ -84,7 +84,7 @@ pub fn create_holder_from_proposal(proposal: ProposeCredentialV1) -> Holder { pub fn create_issuer_from_proposal(proposal: ProposeCredentialV1) -> Issuer { let issuer = Issuer::create_from_proposal("TEST_CREDENTIAL", &proposal).unwrap(); assert_eq!(IssuerState::ProposalReceived, issuer.get_state()); - assert_eq!(proposal.clone(), issuer.get_proposal().unwrap()); + assert_eq!(proposal, issuer.get_proposal().unwrap()); issuer } diff --git a/aries_vcx_core/Cargo.toml b/aries_vcx_core/Cargo.toml index b121fef3a6..d45bf3a35d 100644 --- a/aries_vcx_core/Cargo.toml +++ b/aries_vcx_core/Cargo.toml @@ -13,11 +13,11 @@ vdr_proxy_ledger = ["credx", "dep:indy-vdr-proxy-client"] legacy_proof = [] [dependencies] -agency_client = { path = "../agency_client" } +agency_client = { path = "../aries/legacy/agency_client" } indy-vdr = { git = "https://github.com/hyperledger/indy-vdr.git", rev = "c143268", default-features = false, features = ["log"] } indy-credx = { git = "https://github.com/hyperledger/indy-shared-rs", tag = "v1.1.0", optional = true } -libvdrtools = { path = "../libvdrtools", optional = true } -indy-api-types = { path = "../libvdrtools/indy-api-types", optional = true } +libvdrtools = { path = "../aries/legacy/libvdrtools", optional = true } +indy-api-types = { path = "../aries/legacy/libvdrtools/indy-api-types", optional = true } async-trait = "0.1.68" futures = { version = "0.3", default-features = false } serde_json = "1.0.95" diff --git a/did_parser/Cargo.toml b/did_parser/Cargo.toml index ec1d9bd63e..68c895f4bd 100644 --- a/did_parser/Cargo.toml +++ b/did_parser/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] serde = "1.0.160" -shared_vcx = { path = "../shared_vcx" } # TODO: Remove as soon as migration to qualified DIDs is complete +shared = { path = "../aries/shared" } # TODO: Remove as soon as migration to qualified DIDs is complete diff --git a/did_parser/src/utils/parse.rs b/did_parser/src/utils/parse.rs index 00a45cbb26..5bce59ee39 100644 --- a/did_parser/src/utils/parse.rs +++ b/did_parser/src/utils/parse.rs @@ -97,7 +97,7 @@ fn parse_unqualified(did_url: &str) -> Result<(DidRange, Option, DidRa } let id = did_url.split('#').next().unwrap_or(did_url); - shared_vcx::validation::did::validate_did(id) + shared::validation::did::validate_did(id) .map_err(|_| ParseError::InvalidInput("Unqualified DID failed validation"))?; let id_range = 0..id.len(); diff --git a/libvcx_core/README.md b/libvcx_core/README.md deleted file mode 100644 index 34194227a7..0000000000 --- a/libvcx_core/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# libvcx_core -This is foundational crate for -- NodeJS wrapper [`vcx-napi-rs`](../wrappers/vcx-napi-rs) - diff --git a/messages/Cargo.toml b/messages/Cargo.toml index 21dd89d643..6bf3ae0166 100644 --- a/messages/Cargo.toml +++ b/messages/Cargo.toml @@ -22,6 +22,6 @@ transitive = "0.5.0" isolang = { version = "2.2.0" } typed-builder = "0.16.0" messages_macros = { path = "../messages_macros" } -diddoc_legacy = { path = "../diddoc_legacy" } -shared_vcx = { path = "../shared_vcx" } +diddoc_legacy = { path = "../aries/legacy/diddoc_legacy" } +shared = { path = "../aries/shared" } did_parser = { path = "../did_parser" } diff --git a/messages/src/decorators/localization.rs b/messages/src/decorators/localization.rs index 2989038c18..192151cd5e 100644 --- a/messages/src/decorators/localization.rs +++ b/messages/src/decorators/localization.rs @@ -5,7 +5,7 @@ use serde::{ ser::{Error, SerializeMap}, Deserialize, Serialize, Serializer, }; -use shared_vcx::misc::utils::CowStr; +use shared::misc::utils::CowStr; use typed_builder::TypedBuilder; use url::Url; diff --git a/messages/src/decorators/thread.rs b/messages/src/decorators/thread.rs index 9d160bf007..4fd76172d7 100644 --- a/messages/src/decorators/thread.rs +++ b/messages/src/decorators/thread.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use serde::{Deserialize, Serialize}; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use typed_builder::TypedBuilder; /// Struct representing the `~thread` decorator from its [RFC](). diff --git a/messages/src/misc/mod.rs b/messages/src/misc/mod.rs index 2c7015f362..b264511e6f 100644 --- a/messages/src/misc/mod.rs +++ b/messages/src/misc/mod.rs @@ -2,7 +2,7 @@ mod mime_type; pub(crate) mod utils; pub use mime_type::MimeType; -pub use shared_vcx::misc::{serde_ignored::SerdeIgnored as NoDecorators, utils::CowStr}; +pub use shared::misc::{serde_ignored::SerdeIgnored as NoDecorators, utils::CowStr}; #[cfg(test)] @@ -10,7 +10,7 @@ pub mod test_utils { use chrono::{DateTime, Utc}; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; - use shared_vcx::misc::utils::CowStr; + use shared::misc::utils::CowStr; use super::utils; use crate::{ diff --git a/messages/src/msg_fields/protocols/common/attachment_format_specifier.rs b/messages/src/msg_fields/protocols/common/attachment_format_specifier.rs index 1bf91efc5d..72698edbc4 100644 --- a/messages/src/msg_fields/protocols/common/attachment_format_specifier.rs +++ b/messages/src/msg_fields/protocols/common/attachment_format_specifier.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use typed_builder::TypedBuilder; /// Specifies that a particular Attachment, with the id of `attach_id`, has the format of `format`. diff --git a/messages/src/msg_fields/protocols/connection/response.rs b/messages/src/msg_fields/protocols/connection/response.rs index 979111e223..db5768b2db 100644 --- a/messages/src/msg_fields/protocols/connection/response.rs +++ b/messages/src/msg_fields/protocols/connection/response.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use shared_vcx::misc::utils::CowStr; +use shared::misc::utils::CowStr; use typed_builder::TypedBuilder; use crate::{ diff --git a/messages/src/msg_fields/protocols/coordinate_mediation/keylist_query.rs b/messages/src/msg_fields/protocols/coordinate_mediation/keylist_query.rs index 04c06f6ffd..df631c5601 100644 --- a/messages/src/msg_fields/protocols/coordinate_mediation/keylist_query.rs +++ b/messages/src/msg_fields/protocols/coordinate_mediation/keylist_query.rs @@ -35,7 +35,7 @@ pub struct KeylistQueryDecorators { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::misc::serde_ignored::SerdeIgnored as NoDecorators; + use shared::misc::serde_ignored::SerdeIgnored as NoDecorators; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/coordinate_mediation/keylist_update.rs b/messages/src/msg_fields/protocols/coordinate_mediation/keylist_update.rs index 25f29dc557..fda177b6fa 100644 --- a/messages/src/msg_fields/protocols/coordinate_mediation/keylist_update.rs +++ b/messages/src/msg_fields/protocols/coordinate_mediation/keylist_update.rs @@ -37,7 +37,7 @@ pub struct KeylistUpdateDecorators { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::misc::serde_ignored::SerdeIgnored as NoDecorators; + use shared::misc::serde_ignored::SerdeIgnored as NoDecorators; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/coordinate_mediation/mediate_request.rs b/messages/src/msg_fields/protocols/coordinate_mediation/mediate_request.rs index ac92f053c9..3e99b1d380 100644 --- a/messages/src/msg_fields/protocols/coordinate_mediation/mediate_request.rs +++ b/messages/src/msg_fields/protocols/coordinate_mediation/mediate_request.rs @@ -21,7 +21,7 @@ pub struct MediateRequestDecorators { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::misc::serde_ignored::SerdeIgnored as NoDecorators; + use shared::misc::serde_ignored::SerdeIgnored as NoDecorators; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/cred_issuance/v1/mod.rs b/messages/src/msg_fields/protocols/cred_issuance/v1/mod.rs index a85709a63d..95b75f4194 100644 --- a/messages/src/msg_fields/protocols/cred_issuance/v1/mod.rs +++ b/messages/src/msg_fields/protocols/cred_issuance/v1/mod.rs @@ -11,7 +11,7 @@ use std::str::FromStr; use derive_more::From; use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer}; -use shared_vcx::misc::utils::CowStr; +use shared::misc::utils::CowStr; use self::{ ack::{AckCredentialV1, AckCredentialV1Content}, diff --git a/messages/src/msg_fields/protocols/cred_issuance/v2/issue_credential.rs b/messages/src/msg_fields/protocols/cred_issuance/v2/issue_credential.rs index 0764b235e5..6a92d04031 100644 --- a/messages/src/msg_fields/protocols/cred_issuance/v2/issue_credential.rs +++ b/messages/src/msg_fields/protocols/cred_issuance/v2/issue_credential.rs @@ -51,7 +51,7 @@ pub enum IssueCredentialAttachmentFormatType { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::maybe_known::MaybeKnown; + use shared::maybe_known::MaybeKnown; use super::*; use crate::{ @@ -99,7 +99,7 @@ mod tests { let content = IssueCredentialV2Content::builder() .formats(vec![AttachmentFormatSpecifier { attach_id: "1".to_owned(), - format: shared_vcx::maybe_known::MaybeKnown::Known( + format: shared::maybe_known::MaybeKnown::Known( IssueCredentialAttachmentFormatType::HyperledgerIndyCredential2_0, ), }]) diff --git a/messages/src/msg_fields/protocols/cred_issuance/v2/mod.rs b/messages/src/msg_fields/protocols/cred_issuance/v2/mod.rs index 3fd932f4e9..200ff03b91 100644 --- a/messages/src/msg_fields/protocols/cred_issuance/v2/mod.rs +++ b/messages/src/msg_fields/protocols/cred_issuance/v2/mod.rs @@ -11,7 +11,7 @@ use std::str::FromStr; use derive_more::From; use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer}; -use shared_vcx::misc::utils::CowStr; +use shared::misc::utils::CowStr; use self::{ ack::{AckCredentialV2, AckCredentialV2Content}, diff --git a/messages/src/msg_fields/protocols/cred_issuance/v2/offer_credential.rs b/messages/src/msg_fields/protocols/cred_issuance/v2/offer_credential.rs index 1bd67def8a..39a499a3e3 100644 --- a/messages/src/msg_fields/protocols/cred_issuance/v2/offer_credential.rs +++ b/messages/src/msg_fields/protocols/cred_issuance/v2/offer_credential.rs @@ -53,7 +53,7 @@ pub enum OfferCredentialAttachmentFormatType { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::maybe_known::MaybeKnown; + use shared::maybe_known::MaybeKnown; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/cred_issuance/v2/propose_credential.rs b/messages/src/msg_fields/protocols/cred_issuance/v2/propose_credential.rs index 623b79a120..f197c90783 100644 --- a/messages/src/msg_fields/protocols/cred_issuance/v2/propose_credential.rs +++ b/messages/src/msg_fields/protocols/cred_issuance/v2/propose_credential.rs @@ -52,7 +52,7 @@ pub enum ProposeCredentialAttachmentFormatType { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::maybe_known::MaybeKnown; + use shared::maybe_known::MaybeKnown; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/cred_issuance/v2/request_credential.rs b/messages/src/msg_fields/protocols/cred_issuance/v2/request_credential.rs index a93dddbb6a..210c5ad0e3 100644 --- a/messages/src/msg_fields/protocols/cred_issuance/v2/request_credential.rs +++ b/messages/src/msg_fields/protocols/cred_issuance/v2/request_credential.rs @@ -48,7 +48,7 @@ pub enum RequestCredentialAttachmentFormatType { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::maybe_known::MaybeKnown; + use shared::maybe_known::MaybeKnown; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/discover_features/disclose.rs b/messages/src/msg_fields/protocols/discover_features/disclose.rs index 2f03af6c42..1ff39d439d 100644 --- a/messages/src/msg_fields/protocols/discover_features/disclose.rs +++ b/messages/src/msg_fields/protocols/discover_features/disclose.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use typed_builder::TypedBuilder; use super::ProtocolDescriptor; @@ -48,7 +48,7 @@ pub struct DiscloseDecorators { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::maybe_known::MaybeKnown; + use shared::maybe_known::MaybeKnown; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/discover_features/mod.rs b/messages/src/msg_fields/protocols/discover_features/mod.rs index 5146c3b2b7..72e491b49b 100644 --- a/messages/src/msg_fields/protocols/discover_features/mod.rs +++ b/messages/src/msg_fields/protocols/discover_features/mod.rs @@ -5,7 +5,7 @@ pub mod query; use derive_more::From; use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer}; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use typed_builder::TypedBuilder; use self::{ diff --git a/messages/src/msg_fields/protocols/discover_features/query.rs b/messages/src/msg_fields/protocols/discover_features/query.rs index fd84a99045..a3471fb87c 100644 --- a/messages/src/msg_fields/protocols/discover_features/query.rs +++ b/messages/src/msg_fields/protocols/discover_features/query.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use typed_builder::TypedBuilder; use super::ProtocolDescriptor; diff --git a/messages/src/msg_fields/protocols/out_of_band/invitation.rs b/messages/src/msg_fields/protocols/out_of_band/invitation.rs index 04bf8a084b..6f0381dfd8 100644 --- a/messages/src/msg_fields/protocols/out_of_band/invitation.rs +++ b/messages/src/msg_fields/protocols/out_of_band/invitation.rs @@ -1,6 +1,6 @@ use diddoc_legacy::aries::service::AriesService; use serde::{Deserialize, Serialize}; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use typed_builder::TypedBuilder; use super::OobGoalCode; diff --git a/messages/src/msg_fields/protocols/out_of_band/reuse.rs b/messages/src/msg_fields/protocols/out_of_band/reuse.rs index 3428f051c5..7a0a807cec 100644 --- a/messages/src/msg_fields/protocols/out_of_band/reuse.rs +++ b/messages/src/msg_fields/protocols/out_of_band/reuse.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use shared_vcx::misc::serde_ignored::SerdeIgnored; +use shared::misc::serde_ignored::SerdeIgnored; use typed_builder::TypedBuilder; use crate::{ diff --git a/messages/src/msg_fields/protocols/out_of_band/reuse_accepted.rs b/messages/src/msg_fields/protocols/out_of_band/reuse_accepted.rs index 4db73263b9..8553722ff8 100644 --- a/messages/src/msg_fields/protocols/out_of_band/reuse_accepted.rs +++ b/messages/src/msg_fields/protocols/out_of_band/reuse_accepted.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use shared_vcx::misc::serde_ignored::SerdeIgnored; +use shared::misc::serde_ignored::SerdeIgnored; use typed_builder::TypedBuilder; use crate::{ diff --git a/messages/src/msg_fields/protocols/present_proof/v1/propose.rs b/messages/src/msg_fields/protocols/present_proof/v1/propose.rs index 9c0b5c8779..058ccd971a 100644 --- a/messages/src/msg_fields/protocols/present_proof/v1/propose.rs +++ b/messages/src/msg_fields/protocols/present_proof/v1/propose.rs @@ -1,7 +1,7 @@ use std::str::FromStr; use serde::{Deserialize, Serialize}; -use shared_vcx::misc::utils::CowStr; +use shared::misc::utils::CowStr; use typed_builder::TypedBuilder; use crate::{ diff --git a/messages/src/msg_fields/protocols/present_proof/v2/present.rs b/messages/src/msg_fields/protocols/present_proof/v2/present.rs index ef637fe5ca..1409dc48ec 100644 --- a/messages/src/msg_fields/protocols/present_proof/v2/present.rs +++ b/messages/src/msg_fields/protocols/present_proof/v2/present.rs @@ -50,7 +50,7 @@ pub enum PresentationAttachmentFormatType { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::maybe_known::MaybeKnown; + use shared::maybe_known::MaybeKnown; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/present_proof/v2/propose.rs b/messages/src/msg_fields/protocols/present_proof/v2/propose.rs index dc26de1aa4..97386b4817 100644 --- a/messages/src/msg_fields/protocols/present_proof/v2/propose.rs +++ b/messages/src/msg_fields/protocols/present_proof/v2/propose.rs @@ -49,7 +49,7 @@ pub enum ProposePresentationAttachmentFormatType { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::maybe_known::MaybeKnown; + use shared::maybe_known::MaybeKnown; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/present_proof/v2/request.rs b/messages/src/msg_fields/protocols/present_proof/v2/request.rs index 0dfc6312ba..d07fb10699 100644 --- a/messages/src/msg_fields/protocols/present_proof/v2/request.rs +++ b/messages/src/msg_fields/protocols/present_proof/v2/request.rs @@ -52,7 +52,7 @@ pub enum PresentationRequestAttachmentFormatType { #[allow(clippy::field_reassign_with_default)] mod tests { use serde_json::json; - use shared_vcx::maybe_known::MaybeKnown; + use shared::maybe_known::MaybeKnown; use super::*; use crate::{ diff --git a/messages/src/msg_fields/protocols/report_problem.rs b/messages/src/msg_fields/protocols/report_problem.rs index c0a20c1645..d31840d73d 100644 --- a/messages/src/msg_fields/protocols/report_problem.rs +++ b/messages/src/msg_fields/protocols/report_problem.rs @@ -7,7 +7,7 @@ use serde::{ ser::{Error as SerError, SerializeMap}, Deserialize, Deserializer, Serialize, Serializer, }; -use shared_vcx::misc::utils::CowStr; +use shared::misc::utils::CowStr; use strum_macros::{AsRefStr, EnumString}; use typed_builder::TypedBuilder; use url::Url; diff --git a/messages/src/msg_fields/protocols/revocation/revoke.rs b/messages/src/msg_fields/protocols/revocation/revoke.rs index c56c16f428..6568d6e175 100644 --- a/messages/src/msg_fields/protocols/revocation/revoke.rs +++ b/messages/src/msg_fields/protocols/revocation/revoke.rs @@ -1,5 +1,5 @@ use serde::{Deserialize, Serialize}; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use typed_builder::TypedBuilder; use crate::{ diff --git a/messages/src/msg_fields/protocols/routing.rs b/messages/src/msg_fields/protocols/routing.rs index 44eb999928..02b8c992d3 100644 --- a/messages/src/msg_fields/protocols/routing.rs +++ b/messages/src/msg_fields/protocols/routing.rs @@ -23,8 +23,8 @@ into_msg_with_type!(Forward, RoutingTypeV1_0, Forward); mod tests { use serde_json::json; - // Bind `shared_vcx::misc::serde_ignored::SerdeIgnored` type as `NoDecorators`. - use shared_vcx::misc::serde_ignored::SerdeIgnored as NoDecorators; + // Bind `shared::misc::serde_ignored::SerdeIgnored` type as `NoDecorators`. + use shared::misc::serde_ignored::SerdeIgnored as NoDecorators; use super::*; use crate::misc::test_utils; diff --git a/messages/src/msg_parts.rs b/messages/src/msg_parts.rs index 13ce402b67..394b72a38c 100644 --- a/messages/src/msg_parts.rs +++ b/messages/src/msg_parts.rs @@ -1,6 +1,6 @@ use serde::{Deserialize, Serialize}; -// Bind `shared_vcx::misc::serde_ignored::SerdeIgnored` type as `NoDecorators`. -use shared_vcx::misc::serde_ignored::SerdeIgnored as NoDecorators; +// Bind `shared::misc::serde_ignored::SerdeIgnored` type as `NoDecorators`. +use shared::misc::serde_ignored::SerdeIgnored as NoDecorators; use typed_builder::TypedBuilder; /// Struct representing a complete message (apart from the `@type` field) as defined in a protocol diff --git a/messages/src/msg_types/protocols/mod.rs b/messages/src/msg_types/protocols/mod.rs index 412045f1b1..56b09f35af 100644 --- a/messages/src/msg_types/protocols/mod.rs +++ b/messages/src/msg_types/protocols/mod.rs @@ -2,7 +2,7 @@ use std::{fmt::Display, str::FromStr}; use derive_more::{From, TryInto}; use serde::{Deserialize, Serialize}; -use shared_vcx::misc::utils::CowStr; +use shared::misc::utils::CowStr; use self::{ basic_message::BasicMessageType, connection::ConnectionType, diff --git a/messages/src/msg_types/registry.rs b/messages/src/msg_types/registry.rs index c3326e66bd..47b7b77b8b 100644 --- a/messages/src/msg_types/registry.rs +++ b/messages/src/msg_types/registry.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use lazy_static::lazy_static; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use super::{role::Role, Protocol}; use crate::msg_types::{ diff --git a/messages/src/msg_types/traits.rs b/messages/src/msg_types/traits.rs index 1b2d355c94..ed20a6a01f 100644 --- a/messages/src/msg_types/traits.rs +++ b/messages/src/msg_types/traits.rs @@ -1,6 +1,6 @@ use std::str::FromStr; -use shared_vcx::maybe_known::MaybeKnown; +use shared::maybe_known::MaybeKnown; use crate::{error::MsgTypeResult, msg_types::role::Role}; diff --git a/messages_macros/Cargo.toml b/messages_macros/Cargo.toml index 2471d1cf70..54bacee7d3 100644 --- a/messages_macros/Cargo.toml +++ b/messages_macros/Cargo.toml @@ -13,4 +13,4 @@ proc-macro2 = "1.0.58" quote = "1.0.27" syn = "2.0.16" darling = "0.20.1" -shared_vcx = { path = "../shared_vcx" } +shared = { path = "../aries/shared" } diff --git a/messages_macros/src/message_type.rs b/messages_macros/src/message_type.rs index 5317de42f5..986993c1b1 100644 --- a/messages_macros/src/message_type.rs +++ b/messages_macros/src/message_type.rs @@ -180,7 +180,7 @@ fn process_version(Version { ident, data, major }: Version) -> SynResult vec![#(shared_vcx::maybe_known::MaybeKnown::Known(#roles)),*]}); + .push(quote! {Self::#var_ident(_) => vec![#(shared::maybe_known::MaybeKnown::Known(#roles)),*]}); // Implement a function such as `new_v1_0` which returns the enum variant in this iteration. constructor_impls @@ -200,7 +200,7 @@ fn process_version(Version { ident, data, major }: Version) -> SynResult>; + type Roles = Vec>; const MAJOR: u8 = #major; diff --git a/tools/test_utils/Cargo.toml b/tools/test_utils/Cargo.toml index dac88f03cc..530626deb2 100644 --- a/tools/test_utils/Cargo.toml +++ b/tools/test_utils/Cargo.toml @@ -15,7 +15,7 @@ credx = ["aries_vcx_core/credx"] [dependencies] aries_vcx_core = { path = "../../aries_vcx_core" } -agency_client = { path = "../../agency_client" } +agency_client = { path = "../../aries/legacy/agency_client" } libvcx_logger = { path = "../libvcx_logger" } lazy_static = "1" serde_json = "1" @@ -23,4 +23,4 @@ log = "0.4" chrono = "0.4" rand = "0.8" uuid = { version = "1", default-features = false, features = ["v4"] } -async-trait = "0.1" \ No newline at end of file +async-trait = "0.1" diff --git a/wallet_migrator/Cargo.toml b/tools/wallet_migrator/Cargo.toml similarity index 71% rename from wallet_migrator/Cargo.toml rename to tools/wallet_migrator/Cargo.toml index 124871d161..ea319dacd0 100644 --- a/wallet_migrator/Cargo.toml +++ b/tools/wallet_migrator/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -aries_vcx_core = { path = "../aries_vcx_core", features = ["credx", "vdrtools_wallet"] } +aries_vcx_core = { path = "../../aries_vcx_core", features = ["credx", "vdrtools_wallet"] } credx = { package = "indy-credx", git = "https://github.com/hyperledger/indy-shared-rs", tag = "v1.1.0" } -vdrtools = { package = "libvdrtools", path = "../libvdrtools" } +vdrtools = { package = "libvdrtools", path = "../../aries/legacy/libvdrtools" } serde_json = "1.0.96" thiserror = "1.0.40" log = "0.4.19" diff --git a/wallet_migrator/src/credx2anoncreds/conv.rs b/tools/wallet_migrator/src/credx2anoncreds/conv.rs similarity index 100% rename from wallet_migrator/src/credx2anoncreds/conv.rs rename to tools/wallet_migrator/src/credx2anoncreds/conv.rs diff --git a/wallet_migrator/src/credx2anoncreds/mod.rs b/tools/wallet_migrator/src/credx2anoncreds/mod.rs similarity index 100% rename from wallet_migrator/src/credx2anoncreds/mod.rs rename to tools/wallet_migrator/src/credx2anoncreds/mod.rs diff --git a/wallet_migrator/src/error.rs b/tools/wallet_migrator/src/error.rs similarity index 100% rename from wallet_migrator/src/error.rs rename to tools/wallet_migrator/src/error.rs diff --git a/wallet_migrator/src/lib.rs b/tools/wallet_migrator/src/lib.rs similarity index 100% rename from wallet_migrator/src/lib.rs rename to tools/wallet_migrator/src/lib.rs diff --git a/wallet_migrator/src/vdrtools2credx/conv.rs b/tools/wallet_migrator/src/vdrtools2credx/conv.rs similarity index 100% rename from wallet_migrator/src/vdrtools2credx/conv.rs rename to tools/wallet_migrator/src/vdrtools2credx/conv.rs diff --git a/wallet_migrator/src/vdrtools2credx/mod.rs b/tools/wallet_migrator/src/vdrtools2credx/mod.rs similarity index 100% rename from wallet_migrator/src/vdrtools2credx/mod.rs rename to tools/wallet_migrator/src/vdrtools2credx/mod.rs diff --git a/uniffi_aries_vcx/core/Cargo.toml b/uniffi_aries_vcx/core/Cargo.toml index ca2867f541..2447129bfc 100644 --- a/uniffi_aries_vcx/core/Cargo.toml +++ b/uniffi_aries_vcx/core/Cargo.toml @@ -27,8 +27,8 @@ thiserror = "1.0.38" serde_json = "1.0.91" serde = { version = "1.0.188", features = ["derive"] } async-trait = "0.1.64" -diddoc_legacy = { path = "../../diddoc_legacy" } -shared_vcx = { path = "../../shared_vcx" } +diddoc_legacy = { path = "../../aries/legacy/diddoc_legacy" } +shared = { path = "../../aries/shared" } url = "2.3.1" [build-dependencies] diff --git a/uniffi_aries_vcx/core/src/core/http_client.rs b/uniffi_aries_vcx/core/src/core/http_client.rs index cdabeb0d32..99c6fb4f28 100644 --- a/uniffi_aries_vcx/core/src/core/http_client.rs +++ b/uniffi_aries_vcx/core/src/core/http_client.rs @@ -1,6 +1,6 @@ use aries_vcx::{errors::error::VcxResult, transport::Transport}; use async_trait::async_trait; -use shared_vcx::http_client::post_message; +use shared::http_client::post_message; use url::Url; pub struct HttpClient;