refactor: uniffi project reorganize (#1068)

hyperledger · Nov 27, 2023 · 882529c · 882529c
1 parent e1b05ba
commit 882529c
Show file tree

Hide file tree

Showing 72 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,7 @@ members = [
     "aries/agents/rust/mediator",
     "aries/agents/rust/mediator/client-tui",
     "aries/agents/rust/aries-vcx-agent",
+    "aries/wrappers/uniffi-aries-vcx/core",
     "aries/wrappers/vcx-napi-rs",
     "aries/aries_vcx_core",
     "aries/misc/indy_ledger_response_parser",
@@ -31,7 +32,6 @@ members = [
     "did_core/public_key",
     "misc/simple_message_relay",
     "misc/display_as_json",
-    "uniffi_aries_vcx/core",
 ]
 
 [workspace.package]

diff --git a/uniffi_aries_vcx/demo/.gitignore → aries/agents/rust/mobile_demo/.gitignore b/uniffi_aries_vcx/demo/.gitignore → aries/agents/rust/mobile_demo/.gitignore
diff --git a/uniffi_aries_vcx/demo/app/.gitignore → aries/agents/rust/mobile_demo/app/.gitignore b/uniffi_aries_vcx/demo/app/.gitignore → aries/agents/rust/mobile_demo/app/.gitignore
diff --git a/uniffi_aries_vcx/demo/app/build.gradle → .../agents/rust/mobile_demo/app/build.gradle b/uniffi_aries_vcx/demo/app/build.gradle → .../agents/rust/mobile_demo/app/build.gradle
diff --git a/uniffi_aries_vcx/demo/app/proguard-rules.pro → ...s/rust/mobile_demo/app/proguard-rules.pro b/uniffi_aries_vcx/demo/app/proguard-rules.pro → ...s/rust/mobile_demo/app/proguard-rules.pro
diff --git a/...edger/ariesvcx/ExampleInstrumentedTest.kt → ...edger/ariesvcx/ExampleInstrumentedTest.kt b/...edger/ariesvcx/ExampleInstrumentedTest.kt → ...edger/ariesvcx/ExampleInstrumentedTest.kt
diff --git a/...vcx/demo/app/src/main/AndroidManifest.xml → ...ile_demo/app/src/main/AndroidManifest.xml b/...vcx/demo/app/src/main/AndroidManifest.xml → ...ile_demo/app/src/main/AndroidManifest.xml
diff --git a/...hyperledger/ariesvcx/AppDemoController.kt → ...hyperledger/ariesvcx/AppDemoController.kt b/...hyperledger/ariesvcx/AppDemoController.kt → ...hyperledger/ariesvcx/AppDemoController.kt
diff --git a/...ava/org/hyperledger/ariesvcx/Constants.kt → ...ava/org/hyperledger/ariesvcx/Constants.kt b/...ava/org/hyperledger/ariesvcx/Constants.kt → ...ava/org/hyperledger/ariesvcx/Constants.kt
diff --git a/.../org/hyperledger/ariesvcx/HolderScreen.kt → .../org/hyperledger/ariesvcx/HolderScreen.kt b/.../org/hyperledger/ariesvcx/HolderScreen.kt → .../org/hyperledger/ariesvcx/HolderScreen.kt
diff --git a/...va/org/hyperledger/ariesvcx/HomeScreen.kt → ...va/org/hyperledger/ariesvcx/HomeScreen.kt b/...va/org/hyperledger/ariesvcx/HomeScreen.kt → ...va/org/hyperledger/ariesvcx/HomeScreen.kt
diff --git a/.../org/hyperledger/ariesvcx/MainActivity.kt → .../org/hyperledger/ariesvcx/MainActivity.kt b/.../org/hyperledger/ariesvcx/MainActivity.kt → .../org/hyperledger/ariesvcx/MainActivity.kt
diff --git a/...rg/hyperledger/ariesvcx/QrCodeAnalyzer.kt → ...rg/hyperledger/ariesvcx/QrCodeAnalyzer.kt b/...rg/hyperledger/ariesvcx/QrCodeAnalyzer.kt → ...rg/hyperledger/ariesvcx/QrCodeAnalyzer.kt
diff --git a/...va/org/hyperledger/ariesvcx/ScanScreen.kt → ...va/org/hyperledger/ariesvcx/ScanScreen.kt b/...va/org/hyperledger/ariesvcx/ScanScreen.kt → ...va/org/hyperledger/ariesvcx/ScanScreen.kt
diff --git a/...rg/hyperledger/ariesvcx/ui/theme/Color.kt → ...rg/hyperledger/ariesvcx/ui/theme/Color.kt b/...rg/hyperledger/ariesvcx/ui/theme/Color.kt → ...rg/hyperledger/ariesvcx/ui/theme/Color.kt
diff --git a/...rg/hyperledger/ariesvcx/ui/theme/Theme.kt → ...rg/hyperledger/ariesvcx/ui/theme/Theme.kt b/...rg/hyperledger/ariesvcx/ui/theme/Theme.kt → ...rg/hyperledger/ariesvcx/ui/theme/Theme.kt
diff --git a/...org/hyperledger/ariesvcx/ui/theme/Type.kt → ...org/hyperledger/ariesvcx/ui/theme/Type.kt b/...org/hyperledger/ariesvcx/ui/theme/Type.kt → ...org/hyperledger/ariesvcx/ui/theme/Type.kt
diff --git a/...hyperledger/ariesvcx/utils/OkHttpAwait.kt → ...hyperledger/ariesvcx/utils/OkHttpAwait.kt b/...hyperledger/ariesvcx/utils/OkHttpAwait.kt → ...hyperledger/ariesvcx/utils/OkHttpAwait.kt
diff --git a/...dger/ariesvcx/utils/PrepareGenesisFile.kt → ...dger/ariesvcx/utils/PrepareGenesisFile.kt b/...dger/ariesvcx/utils/PrepareGenesisFile.kt → ...dger/ariesvcx/utils/PrepareGenesisFile.kt
diff --git a/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml b/...s/drawable-v24/ic_launcher_foreground.xml → ...s/drawable-v24/ic_launcher_foreground.xml
diff --git a/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml b/...n/res/drawable/ic_launcher_background.xml → ...n/res/drawable/ic_launcher_background.xml
diff --git a/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml b/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/...src/main/res/mipmap-hdpi/ic_launcher.webp → ...src/main/res/mipmap-hdpi/ic_launcher.webp b/...src/main/res/mipmap-hdpi/ic_launcher.webp → ...src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/...in/res/mipmap-hdpi/ic_launcher_round.webp → ...in/res/mipmap-hdpi/ic_launcher_round.webp b/...in/res/mipmap-hdpi/ic_launcher_round.webp → ...in/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/...src/main/res/mipmap-mdpi/ic_launcher.webp → ...src/main/res/mipmap-mdpi/ic_launcher.webp b/...src/main/res/mipmap-mdpi/ic_launcher.webp → ...src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/...in/res/mipmap-mdpi/ic_launcher_round.webp → ...in/res/mipmap-mdpi/ic_launcher_round.webp b/...in/res/mipmap-mdpi/ic_launcher_round.webp → ...in/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/...rc/main/res/mipmap-xhdpi/ic_launcher.webp → ...rc/main/res/mipmap-xhdpi/ic_launcher.webp b/...rc/main/res/mipmap-xhdpi/ic_launcher.webp → ...rc/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/...n/res/mipmap-xhdpi/ic_launcher_round.webp → ...n/res/mipmap-xhdpi/ic_launcher_round.webp b/...n/res/mipmap-xhdpi/ic_launcher_round.webp → ...n/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/...c/main/res/mipmap-xxhdpi/ic_launcher.webp → ...c/main/res/mipmap-xxhdpi/ic_launcher.webp b/...c/main/res/mipmap-xxhdpi/ic_launcher.webp → ...c/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/.../res/mipmap-xxhdpi/ic_launcher_round.webp → .../res/mipmap-xxhdpi/ic_launcher_round.webp b/.../res/mipmap-xxhdpi/ic_launcher_round.webp → .../res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/.../main/res/mipmap-xxxhdpi/ic_launcher.webp → .../main/res/mipmap-xxxhdpi/ic_launcher.webp b/.../main/res/mipmap-xxxhdpi/ic_launcher.webp → .../main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/...res/mipmap-xxxhdpi/ic_launcher_round.webp → ...res/mipmap-xxxhdpi/ic_launcher_round.webp b/...res/mipmap-xxxhdpi/ic_launcher_round.webp → ...res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/...app/src/main/res/raw/bcovrin_transactions → ...app/src/main/res/raw/bcovrin_transactions b/...app/src/main/res/raw/bcovrin_transactions → ...app/src/main/res/raw/bcovrin_transactions
diff --git a/...x/demo/app/src/main/res/values/colors.xml → ...e_demo/app/src/main/res/values/colors.xml b/...x/demo/app/src/main/res/values/colors.xml → ...e_demo/app/src/main/res/values/colors.xml
diff --git a/.../demo/app/src/main/res/values/strings.xml → ..._demo/app/src/main/res/values/strings.xml b/.../demo/app/src/main/res/values/strings.xml → ..._demo/app/src/main/res/values/strings.xml
diff --git a/...x/demo/app/src/main/res/values/themes.xml → ...e_demo/app/src/main/res/values/themes.xml b/...x/demo/app/src/main/res/values/themes.xml → ...e_demo/app/src/main/res/values/themes.xml
diff --git a/...emo/app/src/main/res/xml/backup_rules.xml → ...emo/app/src/main/res/xml/backup_rules.xml b/...emo/app/src/main/res/xml/backup_rules.xml → ...emo/app/src/main/res/xml/backup_rules.xml
diff --git a/...rc/main/res/xml/data_extraction_rules.xml → ...rc/main/res/xml/data_extraction_rules.xml b/...rc/main/res/xml/data_extraction_rules.xml → ...rc/main/res/xml/data_extraction_rules.xml
diff --git a/...g/hyperledger/ariesvcx/ExampleUnitTest.kt → ...g/hyperledger/ariesvcx/ExampleUnitTest.kt b/...g/hyperledger/ariesvcx/ExampleUnitTest.kt → ...g/hyperledger/ariesvcx/ExampleUnitTest.kt
diff --git a/uniffi_aries_vcx/demo/build.gradle → aries/agents/rust/mobile_demo/build.gradle b/uniffi_aries_vcx/demo/build.gradle → aries/agents/rust/mobile_demo/build.gradle
diff --git a/uniffi_aries_vcx/demo/gradle.properties → ...agents/rust/mobile_demo/gradle.properties b/uniffi_aries_vcx/demo/gradle.properties → ...agents/rust/mobile_demo/gradle.properties
diff --git a/...cx/demo/gradle/wrapper/gradle-wrapper.jar → ...le_demo/gradle/wrapper/gradle-wrapper.jar b/...cx/demo/gradle/wrapper/gradle-wrapper.jar → ...le_demo/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/uniffi_aries_vcx/demo/gradlew → aries/agents/rust/mobile_demo/gradlew b/uniffi_aries_vcx/demo/gradlew → aries/agents/rust/mobile_demo/gradlew
diff --git a/uniffi_aries_vcx/demo/gradlew.bat → aries/agents/rust/mobile_demo/gradlew.bat b/uniffi_aries_vcx/demo/gradlew.bat → aries/agents/rust/mobile_demo/gradlew.bat
diff --git a/uniffi_aries_vcx/demo/settings.gradle → ...s/agents/rust/mobile_demo/settings.gradle b/uniffi_aries_vcx/demo/settings.gradle → ...s/agents/rust/mobile_demo/settings.gradle
diff --git a/uniffi_aries_vcx/README.md → aries/wrappers/uniffi-aries-vcx/README.md b/uniffi_aries_vcx/README.md → aries/wrappers/uniffi-aries-vcx/README.md
diff --git a/uniffi_aries_vcx/core/Cargo.toml → ...wrappers/uniffi-aries-vcx/core/Cargo.toml b/uniffi_aries_vcx/core/Cargo.toml → ...wrappers/uniffi-aries-vcx/core/Cargo.toml
@@ -17,7 +17,7 @@ path = "uniffi-bindgen.rs"
 
 [dependencies]
 uniffi = { version = "0.23.0", features = ["cli"] }
-aries_vcx = { path = "../../aries/aries_vcx", features = [
+aries_vcx = { path = "../../../aries_vcx", features = [
     "vdrtools_wallet",
     "credx",
 ] }
@@ -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 = "../../aries/misc/legacy/diddoc_legacy" }
-shared = { path = "../../aries/misc/shared" }
+diddoc_legacy = { path = "../../../misc/legacy/diddoc_legacy" }
+shared = { path = "../../../misc/shared" }
 url = "2.3.1"
 
 [build-dependencies]

diff --git a/uniffi_aries_vcx/core/README.md → .../wrappers/uniffi-aries-vcx/core/README.md b/uniffi_aries_vcx/core/README.md → .../wrappers/uniffi-aries-vcx/core/README.md
diff --git a/uniffi_aries_vcx/core/build.rs → ...s/wrappers/uniffi-aries-vcx/core/build.rs b/uniffi_aries_vcx/core/build.rs → ...s/wrappers/uniffi-aries-vcx/core/build.rs
diff --git a/...fi_aries_vcx/core/src/core/http_client.rs → ...fi-aries-vcx/core/src/core/http_client.rs b/...fi_aries_vcx/core/src/core/http_client.rs → ...fi-aries-vcx/core/src/core/http_client.rs
diff --git a/uniffi_aries_vcx/core/src/core/mod.rs → ...ers/uniffi-aries-vcx/core/src/core/mod.rs b/uniffi_aries_vcx/core/src/core/mod.rs → ...ers/uniffi-aries-vcx/core/src/core/mod.rs
diff --git a/uniffi_aries_vcx/core/src/core/profile.rs → ...uniffi-aries-vcx/core/src/core/profile.rs b/uniffi_aries_vcx/core/src/core/profile.rs → ...uniffi-aries-vcx/core/src/core/profile.rs
diff --git a/...aries_vcx/core/src/core/unpack_message.rs → ...aries-vcx/core/src/core/unpack_message.rs b/...aries_vcx/core/src/core/unpack_message.rs → ...aries-vcx/core/src/core/unpack_message.rs
diff --git a/uniffi_aries_vcx/core/src/errors/error.rs → ...uniffi-aries-vcx/core/src/errors/error.rs b/uniffi_aries_vcx/core/src/errors/error.rs → ...uniffi-aries-vcx/core/src/errors/error.rs
diff --git a/.../core/src/errors/mapping_from_ariesvcx.rs → .../core/src/errors/mapping_from_ariesvcx.rs b/.../core/src/errors/mapping_from_ariesvcx.rs → .../core/src/errors/mapping_from_ariesvcx.rs
diff --git a/...cx/core/src/errors/mapping_from_others.rs → ...cx/core/src/errors/mapping_from_others.rs b/...cx/core/src/errors/mapping_from_others.rs → ...cx/core/src/errors/mapping_from_others.rs
diff --git a/uniffi_aries_vcx/core/src/errors/mod.rs → ...s/uniffi-aries-vcx/core/src/errors/mod.rs b/uniffi_aries_vcx/core/src/errors/mod.rs → ...s/uniffi-aries-vcx/core/src/errors/mod.rs
diff --git a/...aries_vcx/core/src/handlers/connection.rs → ...aries-vcx/core/src/handlers/connection.rs b/...aries_vcx/core/src/handlers/connection.rs → ...aries-vcx/core/src/handlers/connection.rs
diff --git a/uniffi_aries_vcx/core/src/handlers/holder.rs → ...ffi-aries-vcx/core/src/handlers/holder.rs b/uniffi_aries_vcx/core/src/handlers/holder.rs → ...ffi-aries-vcx/core/src/handlers/holder.rs
diff --git a/uniffi_aries_vcx/core/src/handlers/mod.rs → ...uniffi-aries-vcx/core/src/handlers/mod.rs b/uniffi_aries_vcx/core/src/handlers/mod.rs → ...uniffi-aries-vcx/core/src/handlers/mod.rs
diff --git a/uniffi_aries_vcx/core/src/lib.rs → ...wrappers/uniffi-aries-vcx/core/src/lib.rs b/uniffi_aries_vcx/core/src/lib.rs → ...wrappers/uniffi-aries-vcx/core/src/lib.rs
diff --git a/uniffi_aries_vcx/core/src/runtime.rs → ...pers/uniffi-aries-vcx/core/src/runtime.rs b/uniffi_aries_vcx/core/src/runtime.rs → ...pers/uniffi-aries-vcx/core/src/runtime.rs
diff --git a/uniffi_aries_vcx/core/src/vcx.udl → ...rappers/uniffi-aries-vcx/core/src/vcx.udl b/uniffi_aries_vcx/core/src/vcx.udl → ...rappers/uniffi-aries-vcx/core/src/vcx.udl
diff --git a/uniffi_aries_vcx/core/uniffi-bindgen.rs → ...s/uniffi-aries-vcx/core/uniffi-bindgen.rs b/uniffi_aries_vcx/core/uniffi-bindgen.rs → ...s/uniffi-aries-vcx/core/uniffi-bindgen.rs
diff --git a/uniffi_aries_vcx/core/uniffi.toml → ...rappers/uniffi-aries-vcx/core/uniffi.toml b/uniffi_aries_vcx/core/uniffi.toml → ...rappers/uniffi-aries-vcx/core/uniffi.toml
diff --git a/...es_vcx/scripts/android.build.cargo.ndk.sh → ...es-vcx/scripts/android.build.cargo.ndk.sh b/...es_vcx/scripts/android.build.cargo.ndk.sh → ...es-vcx/scripts/android.build.cargo.ndk.sh
@@ -4,16 +4,16 @@ set -ex
 SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
 
 # Required env vars
-ARIES_VCX_ROOT=$(dirname $(dirname $SCRIPT_DIR))
+ARIES_VCX_ROOT=$(dirname $(dirname $(dirname $(dirname $SCRIPT_DIR))))
 ANDROID_BUILD_DEPS_DIR=${ARIES_VCX_ROOT}/target/android_build_deps
 LANGUAGE="kotlin"
 TARGET="aarch64-linux-android"
 TARGET_NICKNAME="arm64"
 ABI="arm64-v8a"
 
 generate_bindings() {
-    export UNIFFI_ROOT="${ARIES_VCX_ROOT}/uniffi_aries_vcx"
-    export ANDROID_DEMO_DIR="${UNIFFI_ROOT}/demo"
+    export UNIFFI_ROOT="${ARIES_VCX_ROOT}/aries/wrappers/uniffi-aries-vcx"
+    export ANDROID_DEMO_DIR="${ARIES_VCX_ROOT}/aries/agents/rust/mobile_demo"
 
     pushd "${UNIFFI_ROOT}/core"
         cargo run --features=uniffi/cli --bin uniffi-bindgen generate src/vcx.udl --language ${LANGUAGE}
@@ -65,8 +65,8 @@ setup_linked_dependencies() {
 }
 
 build_uniffi_for_demo() {
-    export UNIFFI_ROOT="${ARIES_VCX_ROOT}/uniffi_aries_vcx"
-    export ANDROID_DEMO_DIR="${UNIFFI_ROOT}/demo"
+    export UNIFFI_ROOT="${ARIES_VCX_ROOT}/aries/wrappers/uniffi-aries-vcx"
+    export ANDROID_DEMO_DIR="${ARIES_VCX_ROOT}/aries/agents/rust/mobile_demo"
     export ABI_PATH=${ANDROID_DEMO_DIR}/app/src/main/jniLibs/${ABI}
     mkdir -p ${ABI_PATH}
 

diff --git a/uniffi_aries_vcx/scripts/android.build.sh → ...uniffi-aries-vcx/scripts/android.build.sh b/uniffi_aries_vcx/scripts/android.build.sh → ...uniffi-aries-vcx/scripts/android.build.sh
diff --git a/uniffi_aries_vcx/scripts/android.prepare.sh → ...iffi-aries-vcx/scripts/android.prepare.sh b/uniffi_aries_vcx/scripts/android.prepare.sh → ...iffi-aries-vcx/scripts/android.prepare.sh
diff --git a/...fi_aries_vcx/scripts/android.toolchain.sh → ...fi-aries-vcx/scripts/android.toolchain.sh b/...fi_aries_vcx/scripts/android.toolchain.sh → ...fi-aries-vcx/scripts/android.toolchain.sh
diff --git a/uniffi_aries_vcx/scripts/android.utils.sh → ...uniffi-aries-vcx/scripts/android.utils.sh b/uniffi_aries_vcx/scripts/android.utils.sh → ...uniffi-aries-vcx/scripts/android.utils.sh