From 19e6d008420cabbf7e6e77953584fb0a957ad129 Mon Sep 17 00:00:00 2001 From: Naian <126972030+nain-F49FF806@users.noreply.github.com> Date: Tue, 14 Nov 2023 10:50:14 +0100 Subject: [PATCH] revert move of aries-vcx-agent. it's in right place for now. Signed-off-by: Naian <126972030+nain-F49FF806@users.noreply.github.com> --- Cargo.toml | 2 +- {aries/agents => agents}/rust/README.md | 3 ++- {aries/agents => agents}/rust/aries-vcx-agent/.gitignore | 0 {aries/agents => agents}/rust/aries-vcx-agent/Cargo.toml | 6 +++--- .../rust/aries-vcx-agent/src/agent/agent_config.rs | 0 .../rust/aries-vcx-agent/src/agent/agent_struct.rs | 0 .../rust/aries-vcx-agent/src/agent/init.rs | 0 .../agents => agents}/rust/aries-vcx-agent/src/agent/mod.rs | 0 .../rust/aries-vcx-agent/src/error/convertors.rs | 0 .../rust/aries-vcx-agent/src/error/error_kind.rs | 0 .../rust/aries-vcx-agent/src/error/error_struct.rs | 0 .../agents => agents}/rust/aries-vcx-agent/src/error/mod.rs | 0 .../rust/aries-vcx-agent/src/error/result.rs | 0 {aries/agents => agents}/rust/aries-vcx-agent/src/http.rs | 0 {aries/agents => agents}/rust/aries-vcx-agent/src/lib.rs | 0 .../rust/aries-vcx-agent/src/services/connection.rs | 0 .../aries-vcx-agent/src/services/credential_definition.rs | 0 .../rust/aries-vcx-agent/src/services/holder.rs | 0 .../rust/aries-vcx-agent/src/services/issuer.rs | 0 .../rust/aries-vcx-agent/src/services/mod.rs | 0 .../rust/aries-vcx-agent/src/services/prover.rs | 0 .../aries-vcx-agent/src/services/revocation_registry.rs | 0 .../rust/aries-vcx-agent/src/services/schema.rs | 0 .../rust/aries-vcx-agent/src/services/verifier.rs | 0 .../rust/aries-vcx-agent/src/storage/mod.rs | 0 .../rust/aries-vcx-agent/src/storage/object_cache.rs | 0 26 files changed, 6 insertions(+), 5 deletions(-) rename {aries/agents => agents}/rust/README.md (99%) rename {aries/agents => agents}/rust/aries-vcx-agent/.gitignore (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/Cargo.toml (69%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/agent/agent_config.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/agent/agent_struct.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/agent/init.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/agent/mod.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/error/convertors.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/error/error_kind.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/error/error_struct.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/error/mod.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/error/result.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/http.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/lib.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/services/connection.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/services/credential_definition.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/services/holder.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/services/issuer.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/services/mod.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/services/prover.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/services/revocation_registry.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/services/schema.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/services/verifier.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/storage/mod.rs (100%) rename {aries/agents => agents}/rust/aries-vcx-agent/src/storage/object_cache.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index cda3566e01..42ed3c5256 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ members = [ "diddoc_legacy", "aries/agents/rust/mediator", "aries/agents/rust/mediator/client-tui", - "aries/agents/rust/aries-vcx-agent", + "agents/rust/aries-vcx-agent", "wrappers/vcx-napi-rs", "aries_vcx_core", "uniffi_aries_vcx/core", diff --git a/aries/agents/rust/README.md b/agents/rust/README.md similarity index 99% rename from aries/agents/rust/README.md rename to agents/rust/README.md index 20188f7543..eb2d1ff2f1 100644 --- a/aries/agents/rust/README.md +++ b/agents/rust/README.md @@ -1,4 +1,5 @@ # 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) +- `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/rust/aries-vcx-agent/.gitignore b/agents/rust/aries-vcx-agent/.gitignore similarity index 100% rename from aries/agents/rust/aries-vcx-agent/.gitignore rename to agents/rust/aries-vcx-agent/.gitignore diff --git a/aries/agents/rust/aries-vcx-agent/Cargo.toml b/agents/rust/aries-vcx-agent/Cargo.toml similarity index 69% rename from aries/agents/rust/aries-vcx-agent/Cargo.toml rename to agents/rust/aries-vcx-agent/Cargo.toml index 62e334e366..f43bfe2a8f 100644 --- a/aries/agents/rust/aries-vcx-agent/Cargo.toml +++ b/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_vcx = { path = "../../../shared_vcx" } async-trait = "0.1.64" derive_builder = "0.12.0" serde_json = "1.0.85" diff --git a/aries/agents/rust/aries-vcx-agent/src/agent/agent_config.rs b/agents/rust/aries-vcx-agent/src/agent/agent_config.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/agent/agent_config.rs rename to agents/rust/aries-vcx-agent/src/agent/agent_config.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs b/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/agent/agent_struct.rs rename to agents/rust/aries-vcx-agent/src/agent/agent_struct.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/agent/init.rs b/agents/rust/aries-vcx-agent/src/agent/init.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/agent/init.rs rename to agents/rust/aries-vcx-agent/src/agent/init.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/agent/mod.rs b/agents/rust/aries-vcx-agent/src/agent/mod.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/agent/mod.rs rename to agents/rust/aries-vcx-agent/src/agent/mod.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/error/convertors.rs b/agents/rust/aries-vcx-agent/src/error/convertors.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/error/convertors.rs rename to agents/rust/aries-vcx-agent/src/error/convertors.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/error/error_kind.rs b/agents/rust/aries-vcx-agent/src/error/error_kind.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/error/error_kind.rs rename to agents/rust/aries-vcx-agent/src/error/error_kind.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/error/error_struct.rs b/agents/rust/aries-vcx-agent/src/error/error_struct.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/error/error_struct.rs rename to agents/rust/aries-vcx-agent/src/error/error_struct.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/error/mod.rs b/agents/rust/aries-vcx-agent/src/error/mod.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/error/mod.rs rename to agents/rust/aries-vcx-agent/src/error/mod.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/error/result.rs b/agents/rust/aries-vcx-agent/src/error/result.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/error/result.rs rename to agents/rust/aries-vcx-agent/src/error/result.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/http.rs b/agents/rust/aries-vcx-agent/src/http.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/http.rs rename to agents/rust/aries-vcx-agent/src/http.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/lib.rs b/agents/rust/aries-vcx-agent/src/lib.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/lib.rs rename to agents/rust/aries-vcx-agent/src/lib.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/services/connection.rs b/agents/rust/aries-vcx-agent/src/services/connection.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/services/connection.rs rename to agents/rust/aries-vcx-agent/src/services/connection.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/services/credential_definition.rs b/agents/rust/aries-vcx-agent/src/services/credential_definition.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/services/credential_definition.rs rename to agents/rust/aries-vcx-agent/src/services/credential_definition.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/services/holder.rs b/agents/rust/aries-vcx-agent/src/services/holder.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/services/holder.rs rename to agents/rust/aries-vcx-agent/src/services/holder.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/services/issuer.rs b/agents/rust/aries-vcx-agent/src/services/issuer.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/services/issuer.rs rename to agents/rust/aries-vcx-agent/src/services/issuer.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/services/mod.rs b/agents/rust/aries-vcx-agent/src/services/mod.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/services/mod.rs rename to agents/rust/aries-vcx-agent/src/services/mod.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/services/prover.rs b/agents/rust/aries-vcx-agent/src/services/prover.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/services/prover.rs rename to agents/rust/aries-vcx-agent/src/services/prover.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs b/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/services/revocation_registry.rs rename to agents/rust/aries-vcx-agent/src/services/revocation_registry.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/services/schema.rs b/agents/rust/aries-vcx-agent/src/services/schema.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/services/schema.rs rename to agents/rust/aries-vcx-agent/src/services/schema.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/services/verifier.rs b/agents/rust/aries-vcx-agent/src/services/verifier.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/services/verifier.rs rename to agents/rust/aries-vcx-agent/src/services/verifier.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/storage/mod.rs b/agents/rust/aries-vcx-agent/src/storage/mod.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/storage/mod.rs rename to agents/rust/aries-vcx-agent/src/storage/mod.rs diff --git a/aries/agents/rust/aries-vcx-agent/src/storage/object_cache.rs b/agents/rust/aries-vcx-agent/src/storage/object_cache.rs similarity index 100% rename from aries/agents/rust/aries-vcx-agent/src/storage/object_cache.rs rename to agents/rust/aries-vcx-agent/src/storage/object_cache.rs