From 6516c4564c82fd2b08dcc05f380b6b5c84510173 Mon Sep 17 00:00:00 2001 From: otsmr Date: Sat, 18 Apr 2026 13:54:45 +0200 Subject: [PATCH] move files --- .gitignore | 1 + flutter_rust_bridge.yaml | 2 +- lib/core/frb_generated.dart | 2 +- pubspec.lock | 2 +- pubspec.yaml | 6 ++-- rust/.gitignore | 4 ++- rust/Cargo.lock | 31 +++++++++------- rust/core/.gitignore | 3 -- rust/core/Cargo.toml | 33 ------------------ rust/{core => }/src/bridge/error.rs | 0 rust/{core => }/src/bridge/log/mod.rs | 0 rust/{core => }/src/bridge/mod.rs | 0 .../src/bridge/user_discovery_utils.rs | 0 rust/{core => }/src/database/contact.rs | 0 rust/{core => }/src/database/mod.rs | 0 rust/{core => }/src/frb_generated.rs | 0 rust/{core => }/src/lib.rs | 0 rust/{core => }/src/user_discovery_store.rs | 0 rust/{core => }/src/utils.rs | 0 rust/{core => }/tests/testing.db | Bin .../traits.rs => rust_dependencies/.gitignore | 0 rust_dependencies/Cargo.toml | 3 ++ .../protocols/Cargo.toml | 0 .../protocols/build.rs | 0 .../protocols/src/key_verification/error.rs | 0 .../protocols/src/key_verification/mod.rs | 0 .../stores/in_memory_store.rs | 0 .../src/key_verification/stores/mod.rs | 0 .../protocols/src/key_verification/traits.rs | 0 .../src/key_verification/types.proto | 0 .../protocols/src/lib.rs | 0 .../src/passwordless_recovery/mod.rs | 0 .../src/passwordless_recovery/traits.rs | 0 .../src/passwordless_recovery/types.proto | 0 .../protocols/src/user_discovery.rs | 0 .../protocols/src/user_discovery/README.md | 0 .../protocols/src/user_discovery/error.rs | 0 .../user_discovery/stores/in_memory_store.rs | 0 .../src/user_discovery/stores/mod.rs | 0 .../protocols/src/user_discovery/tests.rs | 0 .../protocols/src/user_discovery/traits.rs | 0 .../protocols/src/user_discovery/types.proto | 0 test/rust/create_db_for_rust_testing.dart | 2 +- 43 files changed, 33 insertions(+), 56 deletions(-) delete mode 100644 rust/core/.gitignore delete mode 100644 rust/core/Cargo.toml rename rust/{core => }/src/bridge/error.rs (100%) rename rust/{core => }/src/bridge/log/mod.rs (100%) rename rust/{core => }/src/bridge/mod.rs (100%) rename rust/{core => }/src/bridge/user_discovery_utils.rs (100%) rename rust/{core => }/src/database/contact.rs (100%) rename rust/{core => }/src/database/mod.rs (100%) rename rust/{core => }/src/frb_generated.rs (100%) rename rust/{core => }/src/lib.rs (100%) rename rust/{core => }/src/user_discovery_store.rs (100%) rename rust/{core => }/src/utils.rs (100%) rename rust/{core => }/tests/testing.db (100%) rename rust/protocols/src/passwordless_recovery/traits.rs => rust_dependencies/.gitignore (100%) create mode 100644 rust_dependencies/Cargo.toml rename {rust => rust_dependencies}/protocols/Cargo.toml (100%) rename {rust => rust_dependencies}/protocols/build.rs (100%) rename {rust => rust_dependencies}/protocols/src/key_verification/error.rs (100%) rename {rust => rust_dependencies}/protocols/src/key_verification/mod.rs (100%) rename {rust => rust_dependencies}/protocols/src/key_verification/stores/in_memory_store.rs (100%) rename {rust => rust_dependencies}/protocols/src/key_verification/stores/mod.rs (100%) rename {rust => rust_dependencies}/protocols/src/key_verification/traits.rs (100%) rename {rust => rust_dependencies}/protocols/src/key_verification/types.proto (100%) rename {rust => rust_dependencies}/protocols/src/lib.rs (100%) rename {rust => rust_dependencies}/protocols/src/passwordless_recovery/mod.rs (100%) create mode 100644 rust_dependencies/protocols/src/passwordless_recovery/traits.rs rename {rust => rust_dependencies}/protocols/src/passwordless_recovery/types.proto (100%) rename {rust => rust_dependencies}/protocols/src/user_discovery.rs (100%) rename {rust => rust_dependencies}/protocols/src/user_discovery/README.md (100%) rename {rust => rust_dependencies}/protocols/src/user_discovery/error.rs (100%) rename {rust => rust_dependencies}/protocols/src/user_discovery/stores/in_memory_store.rs (100%) rename {rust => rust_dependencies}/protocols/src/user_discovery/stores/mod.rs (100%) rename {rust => rust_dependencies}/protocols/src/user_discovery/tests.rs (100%) rename {rust => rust_dependencies}/protocols/src/user_discovery/traits.rs (100%) rename {rust => rust_dependencies}/protocols/src/user_discovery/types.proto (100%) diff --git a/.gitignore b/.gitignore index 0ed545b6..22e61b6f 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ app.*.map.json /android/app/.cxx/ android/.kotlin/ devtools_options.yaml +rust/target \ No newline at end of file diff --git a/flutter_rust_bridge.yaml b/flutter_rust_bridge.yaml index 17b5a8f7..30bd38a7 100644 --- a/flutter_rust_bridge.yaml +++ b/flutter_rust_bridge.yaml @@ -1,3 +1,3 @@ rust_input: crate::bridge -rust_root: rust/core +rust_root: rust dart_output: lib/core \ No newline at end of file diff --git a/lib/core/frb_generated.dart b/lib/core/frb_generated.dart index 8e9bdf11..c49fc9c7 100644 --- a/lib/core/frb_generated.dart +++ b/lib/core/frb_generated.dart @@ -75,7 +75,7 @@ class RustLib extends BaseEntrypoint { static const kDefaultExternalLibraryLoaderConfig = ExternalLibraryLoaderConfig( stem: 'rust_lib_twonly', - ioDirectory: 'rust/core/target/release/', + ioDirectory: 'rust/target/release/', webPrefix: 'pkg/', ); } diff --git a/pubspec.lock b/pubspec.lock index 4af8361e..e4208c58 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1810,7 +1810,7 @@ packages: source: hosted version: "2.4.0" sqlite3: - dependency: transitive + dependency: "direct main" description: name: sqlite3 sha256: "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2" diff --git a/pubspec.yaml b/pubspec.yaml index 045e440a..2d2d621a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -58,12 +58,13 @@ dependencies: json_annotation: ^4.9.0 # google.dev protobuf: ^4.0.0 # google.dev scrollable_positioned_list: ^0.3.8 # google.dev + drift: ^2.25.1 + drift_flutter: ^0.2.4 + sqlite3: ^2.9.4 # Flutter Favorite provider: ^6.1.2 - drift: ^2.25.1 - drift_flutter: ^0.2.4 flutter_local_notifications: ^19.1.0 sentry_flutter: ^9.14.0 @@ -112,6 +113,7 @@ dependencies: path: rust_builder flutter_rust_bridge: 2.12.0 + dependency_overrides: dots_indicator: path: ./dependencies/dots_indicator diff --git a/rust/.gitignore b/rust/.gitignore index c41cc9e3..dfb400ce 100644 --- a/rust/.gitignore +++ b/rust/.gitignore @@ -1 +1,3 @@ -/target \ No newline at end of file +/target + +tests/tmp_testing.db* \ No newline at end of file diff --git a/rust/Cargo.lock b/rust/Cargo.lock index c792ed14..5823bc53 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -139,7 +139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5106bf2680d585dc5f29711b8aa5dde353180b8e14af89b7f0424f760c84e7ce" dependencies = [ "hashbrown 0.15.5", - "rand 0.8.5", + "rand 0.8.6", "zeroize", ] @@ -1160,7 +1160,7 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand 0.8.6", "smallvec", "zeroize", ] @@ -1436,7 +1436,6 @@ dependencies = [ "base64", "blahaj", "hmac 0.13.0", - "pretty_env_logger", "prost", "prost-build", "rand 0.10.1", @@ -1466,9 +1465,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" dependencies = [ "libc", "rand_chacha", @@ -1912,7 +1911,7 @@ dependencies = [ "md-5", "memchr", "percent-encoding", - "rand 0.8.5", + "rand 0.8.6", "rsa", "serde", "sha1", @@ -1950,7 +1949,7 @@ dependencies = [ "log", "md-5", "memchr", - "rand 0.8.5", + "rand 0.8.6", "serde", "serde_json", "sha2 0.10.9", @@ -2110,9 +2109,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.0" +version = "1.52.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91135f59b1cbf38c91e73cf3386fca9bb77915c45ce2771460c9d92f0f3d776" +checksum = "b67dee974fe86fd92cc45b7a95fdd2f99a36a6d7b0d431a231178d3d670bbcc6" dependencies = [ "bytes", "libc", @@ -2256,11 +2255,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.2+wasi-0.2.9" +version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", ] [[package]] @@ -2269,7 +2268,7 @@ version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.51.0", ] [[package]] @@ -2546,6 +2545,12 @@ dependencies = [ "wit-bindgen-rust-macro", ] +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + [[package]] name = "wit-bindgen-core" version = "0.51.0" diff --git a/rust/core/.gitignore b/rust/core/.gitignore deleted file mode 100644 index dfb400ce..00000000 --- a/rust/core/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target - -tests/tmp_testing.db* \ No newline at end of file diff --git a/rust/core/Cargo.toml b/rust/core/Cargo.toml deleted file mode 100644 index 25875329..00000000 --- a/rust/core/Cargo.toml +++ /dev/null @@ -1,33 +0,0 @@ -[package] -name = "rust_lib_twonly" -version = "0.1.0" -edition = "2021" - -[lib] -crate-type = ["cdylib", "staticlib"] - -[dependencies] -flutter_rust_bridge = "=2.12.0" -thiserror = "2.0.18" -sqlx = { version = "0.9.0-alpha.1", default-features = false, features = [ - "runtime-tokio", - "sqlite", - "migrate", - "macros", - "chrono", - "derive", - "json", -] } -tokio = { version = "1.44", features = ["full"] } -tracing = "0.1.44" -rand = "0.10.1" -protocols = { path = "../protocols" } -parking_lot = "0.12.5" - -[dev-dependencies] -pretty_env_logger = "0.5.0" -tempfile = "3.27.0" - - -[build-dependencies] -prost-build = "0.14.1" diff --git a/rust/core/src/bridge/error.rs b/rust/src/bridge/error.rs similarity index 100% rename from rust/core/src/bridge/error.rs rename to rust/src/bridge/error.rs diff --git a/rust/core/src/bridge/log/mod.rs b/rust/src/bridge/log/mod.rs similarity index 100% rename from rust/core/src/bridge/log/mod.rs rename to rust/src/bridge/log/mod.rs diff --git a/rust/core/src/bridge/mod.rs b/rust/src/bridge/mod.rs similarity index 100% rename from rust/core/src/bridge/mod.rs rename to rust/src/bridge/mod.rs diff --git a/rust/core/src/bridge/user_discovery_utils.rs b/rust/src/bridge/user_discovery_utils.rs similarity index 100% rename from rust/core/src/bridge/user_discovery_utils.rs rename to rust/src/bridge/user_discovery_utils.rs diff --git a/rust/core/src/database/contact.rs b/rust/src/database/contact.rs similarity index 100% rename from rust/core/src/database/contact.rs rename to rust/src/database/contact.rs diff --git a/rust/core/src/database/mod.rs b/rust/src/database/mod.rs similarity index 100% rename from rust/core/src/database/mod.rs rename to rust/src/database/mod.rs diff --git a/rust/core/src/frb_generated.rs b/rust/src/frb_generated.rs similarity index 100% rename from rust/core/src/frb_generated.rs rename to rust/src/frb_generated.rs diff --git a/rust/core/src/lib.rs b/rust/src/lib.rs similarity index 100% rename from rust/core/src/lib.rs rename to rust/src/lib.rs diff --git a/rust/core/src/user_discovery_store.rs b/rust/src/user_discovery_store.rs similarity index 100% rename from rust/core/src/user_discovery_store.rs rename to rust/src/user_discovery_store.rs diff --git a/rust/core/src/utils.rs b/rust/src/utils.rs similarity index 100% rename from rust/core/src/utils.rs rename to rust/src/utils.rs diff --git a/rust/core/tests/testing.db b/rust/tests/testing.db similarity index 100% rename from rust/core/tests/testing.db rename to rust/tests/testing.db diff --git a/rust/protocols/src/passwordless_recovery/traits.rs b/rust_dependencies/.gitignore similarity index 100% rename from rust/protocols/src/passwordless_recovery/traits.rs rename to rust_dependencies/.gitignore diff --git a/rust_dependencies/Cargo.toml b/rust_dependencies/Cargo.toml new file mode 100644 index 00000000..1f2f14b9 --- /dev/null +++ b/rust_dependencies/Cargo.toml @@ -0,0 +1,3 @@ +[workspace] +members = ["protocols"] +resolver = "3" diff --git a/rust/protocols/Cargo.toml b/rust_dependencies/protocols/Cargo.toml similarity index 100% rename from rust/protocols/Cargo.toml rename to rust_dependencies/protocols/Cargo.toml diff --git a/rust/protocols/build.rs b/rust_dependencies/protocols/build.rs similarity index 100% rename from rust/protocols/build.rs rename to rust_dependencies/protocols/build.rs diff --git a/rust/protocols/src/key_verification/error.rs b/rust_dependencies/protocols/src/key_verification/error.rs similarity index 100% rename from rust/protocols/src/key_verification/error.rs rename to rust_dependencies/protocols/src/key_verification/error.rs diff --git a/rust/protocols/src/key_verification/mod.rs b/rust_dependencies/protocols/src/key_verification/mod.rs similarity index 100% rename from rust/protocols/src/key_verification/mod.rs rename to rust_dependencies/protocols/src/key_verification/mod.rs diff --git a/rust/protocols/src/key_verification/stores/in_memory_store.rs b/rust_dependencies/protocols/src/key_verification/stores/in_memory_store.rs similarity index 100% rename from rust/protocols/src/key_verification/stores/in_memory_store.rs rename to rust_dependencies/protocols/src/key_verification/stores/in_memory_store.rs diff --git a/rust/protocols/src/key_verification/stores/mod.rs b/rust_dependencies/protocols/src/key_verification/stores/mod.rs similarity index 100% rename from rust/protocols/src/key_verification/stores/mod.rs rename to rust_dependencies/protocols/src/key_verification/stores/mod.rs diff --git a/rust/protocols/src/key_verification/traits.rs b/rust_dependencies/protocols/src/key_verification/traits.rs similarity index 100% rename from rust/protocols/src/key_verification/traits.rs rename to rust_dependencies/protocols/src/key_verification/traits.rs diff --git a/rust/protocols/src/key_verification/types.proto b/rust_dependencies/protocols/src/key_verification/types.proto similarity index 100% rename from rust/protocols/src/key_verification/types.proto rename to rust_dependencies/protocols/src/key_verification/types.proto diff --git a/rust/protocols/src/lib.rs b/rust_dependencies/protocols/src/lib.rs similarity index 100% rename from rust/protocols/src/lib.rs rename to rust_dependencies/protocols/src/lib.rs diff --git a/rust/protocols/src/passwordless_recovery/mod.rs b/rust_dependencies/protocols/src/passwordless_recovery/mod.rs similarity index 100% rename from rust/protocols/src/passwordless_recovery/mod.rs rename to rust_dependencies/protocols/src/passwordless_recovery/mod.rs diff --git a/rust_dependencies/protocols/src/passwordless_recovery/traits.rs b/rust_dependencies/protocols/src/passwordless_recovery/traits.rs new file mode 100644 index 00000000..e69de29b diff --git a/rust/protocols/src/passwordless_recovery/types.proto b/rust_dependencies/protocols/src/passwordless_recovery/types.proto similarity index 100% rename from rust/protocols/src/passwordless_recovery/types.proto rename to rust_dependencies/protocols/src/passwordless_recovery/types.proto diff --git a/rust/protocols/src/user_discovery.rs b/rust_dependencies/protocols/src/user_discovery.rs similarity index 100% rename from rust/protocols/src/user_discovery.rs rename to rust_dependencies/protocols/src/user_discovery.rs diff --git a/rust/protocols/src/user_discovery/README.md b/rust_dependencies/protocols/src/user_discovery/README.md similarity index 100% rename from rust/protocols/src/user_discovery/README.md rename to rust_dependencies/protocols/src/user_discovery/README.md diff --git a/rust/protocols/src/user_discovery/error.rs b/rust_dependencies/protocols/src/user_discovery/error.rs similarity index 100% rename from rust/protocols/src/user_discovery/error.rs rename to rust_dependencies/protocols/src/user_discovery/error.rs diff --git a/rust/protocols/src/user_discovery/stores/in_memory_store.rs b/rust_dependencies/protocols/src/user_discovery/stores/in_memory_store.rs similarity index 100% rename from rust/protocols/src/user_discovery/stores/in_memory_store.rs rename to rust_dependencies/protocols/src/user_discovery/stores/in_memory_store.rs diff --git a/rust/protocols/src/user_discovery/stores/mod.rs b/rust_dependencies/protocols/src/user_discovery/stores/mod.rs similarity index 100% rename from rust/protocols/src/user_discovery/stores/mod.rs rename to rust_dependencies/protocols/src/user_discovery/stores/mod.rs diff --git a/rust/protocols/src/user_discovery/tests.rs b/rust_dependencies/protocols/src/user_discovery/tests.rs similarity index 100% rename from rust/protocols/src/user_discovery/tests.rs rename to rust_dependencies/protocols/src/user_discovery/tests.rs diff --git a/rust/protocols/src/user_discovery/traits.rs b/rust_dependencies/protocols/src/user_discovery/traits.rs similarity index 100% rename from rust/protocols/src/user_discovery/traits.rs rename to rust_dependencies/protocols/src/user_discovery/traits.rs diff --git a/rust/protocols/src/user_discovery/types.proto b/rust_dependencies/protocols/src/user_discovery/types.proto similarity index 100% rename from rust/protocols/src/user_discovery/types.proto rename to rust_dependencies/protocols/src/user_discovery/types.proto diff --git a/test/rust/create_db_for_rust_testing.dart b/test/rust/create_db_for_rust_testing.dart index 948d04b8..a9c308f6 100644 --- a/test/rust/create_db_for_rust_testing.dart +++ b/test/rust/create_db_for_rust_testing.dart @@ -11,7 +11,7 @@ void main() { late File dbFile; setUp(() { - dbFile = File('rust/core/tests/testing.db'); + dbFile = File('rust/tests/testing.db'); if (dbFile.existsSync()) { dbFile.deleteSync(); }