From d3c47577b353234a1cbeade8129c25f172e615a0 Mon Sep 17 00:00:00 2001
From: Maxime Van Hees <maxime.vanhees99@gmail.com>
Date: Tue, 5 Aug 2025 13:21:26 +0200
Subject: [PATCH] removed dep that was not needed anymore (rhailib_dsl)

---
 Cargo.lock             | 232 +++++++++++++++++++----------------------
 core/worker/Cargo.toml |   6 +-
 2 files changed, 108 insertions(+), 130 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dc946ad..16b3d5d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -91,7 +91,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -246,7 +246,7 @@ dependencies = [
  "actix-router",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -257,7 +257,7 @@ checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -410,7 +410,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -526,7 +526,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.104",
+ "syn",
  "which",
 ]
 
@@ -736,7 +736,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -1023,7 +1023,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -1034,7 +1034,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -1062,14 +1062,6 @@ dependencies = [
  "powerfmt",
 ]
 
-[[package]]
-name = "derive"
-version = "0.1.0"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "derive_more"
 version = "2.0.1"
@@ -1087,7 +1079,7 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "unicode-xid",
 ]
 
@@ -1111,7 +1103,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -1351,7 +1343,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -1682,22 +1674,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "hero_examples"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "colored",
- "env_logger",
- "hero_job",
- "hero_supervisor",
- "log",
- "redis 0.25.4",
- "serde_json",
- "tokio",
- "uuid",
-]
-
 [[package]]
 name = "hero_job"
 version = "0.1.0"
@@ -1784,7 +1760,7 @@ dependencies = [
  "futures-util",
  "hero_job",
  "hero_supervisor",
- "heromodels",
+ "heromodels 0.1.0",
  "hex",
  "hmac",
  "log",
@@ -1813,11 +1789,10 @@ version = "0.1.0"
 dependencies = [
  "bincode",
  "chrono",
- "derive",
- "heromodels-derive",
- "heromodels_core",
+ "heromodels-derive 0.1.0",
+ "heromodels_core 0.1.0",
  "jsonb",
- "ourdb",
+ "ourdb 0.1.0",
  "postgres",
  "r2d2",
  "r2d2_postgres",
@@ -1826,7 +1801,30 @@ dependencies = [
  "serde_json",
  "strum",
  "strum_macros",
- "tst",
+ "tst 0.1.0",
+ "uuid",
+]
+
+[[package]]
+name = "heromodels"
+version = "0.1.0"
+source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76"
+dependencies = [
+ "bincode",
+ "chrono",
+ "heromodels-derive 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)",
+ "heromodels_core 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)",
+ "jsonb",
+ "ourdb 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)",
+ "postgres",
+ "r2d2",
+ "r2d2_postgres",
+ "rhai",
+ "serde",
+ "serde_json",
+ "strum",
+ "strum_macros",
+ "tst 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)",
  "uuid",
 ]
 
@@ -1836,7 +1834,17 @@ version = "0.1.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
+]
+
+[[package]]
+name = "heromodels-derive"
+version = "0.1.0"
+source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -1847,6 +1855,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "heromodels_core"
+version = "0.1.0"
+source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76"
+dependencies = [
+ "chrono",
+ "serde",
+]
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -2210,7 +2227,7 @@ dependencies = [
  "indoc",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2327,7 +2344,7 @@ checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2511,7 +2528,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2696,16 +2713,6 @@ dependencies = [
  "hashbrown",
 ]
 
-[[package]]
-name = "macros"
-version = "0.1.0"
-dependencies = [
- "heromodels",
- "heromodels_core",
- "rhai",
- "serde",
-]
-
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -2868,7 +2875,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -2908,6 +2915,17 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
+[[package]]
+name = "ourdb"
+version = "0.1.0"
+source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76"
+dependencies = [
+ "crc32fast",
+ "log",
+ "rand 0.8.5",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.4"
@@ -2978,7 +2996,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3128,7 +3146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "061c1221631e079b26479d25bbf2275bfe5917ae8419cd7e34f13bfc2aa7539a"
 dependencies = [
  "proc-macro2",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -3474,43 +3492,7 @@ checksum = "a5a11a05ee1ce44058fa3d5961d05194fdbe3ad6b40f904af764d81b86450e6b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "rhai_dispatcher"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "clap",
- "colored",
- "env_logger",
- "log",
- "redis 0.25.4",
- "serde",
- "serde_json",
- "tokio",
- "uuid",
-]
-
-[[package]]
-name = "rhailib_dsl"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "derive",
- "dotenv",
- "heromodels",
- "heromodels-derive",
- "heromodels_core",
- "macros",
- "reqwest",
- "rhai",
- "rhai_dispatcher",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "tokio",
+ "syn",
 ]
 
 [[package]]
@@ -3523,13 +3505,12 @@ dependencies = [
  "env_logger",
  "hero_job",
  "hero_supervisor",
- "heromodels",
- "heromodels-derive",
- "heromodels_core",
+ "heromodels 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)",
+ "heromodels-derive 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)",
+ "heromodels_core 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)",
  "log",
  "redis 0.25.4",
  "rhai",
- "rhailib_dsl",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -3843,7 +3824,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4093,7 +4074,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4102,17 +4083,6 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "syn"
 version = "2.0.104"
@@ -4144,7 +4114,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4222,7 +4192,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4233,7 +4203,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4339,7 +4309,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4543,7 +4513,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4565,7 +4535,16 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 name = "tst"
 version = "0.1.0"
 dependencies = [
- "ourdb",
+ "ourdb 0.1.0",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "tst"
+version = "0.1.0"
+source = "git+https://git.ourworld.tf/herocode/db.git#453e86edd24d6009f0b154ac777cc66dc5f3bf76"
+dependencies = [
+ "ourdb 0.1.0 (git+https://git.ourworld.tf/herocode/db.git)",
  "thiserror 1.0.69",
 ]
 
@@ -4823,7 +4802,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -4858,7 +4837,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4981,7 +4960,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -4992,7 +4971,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -5360,7 +5339,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "synstructure",
 ]
 
@@ -5381,7 +5360,7 @@ checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
@@ -5401,7 +5380,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
  "synstructure",
 ]
 
@@ -5441,12 +5420,13 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn",
 ]
 
 [[package]]
 name = "zinit-client"
 version = "0.1.0"
+source = "git+https://github.com/threefoldtech/zinit?branch=master#1b76c062fe31d552d1b7b23484ce163995a81482"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/core/worker/Cargo.toml b/core/worker/Cargo.toml
index c9dc2e5..608450b 100644
--- a/core/worker/Cargo.toml
+++ b/core/worker/Cargo.toml
@@ -25,11 +25,9 @@ thiserror = "1.0"
 async-trait = "0.1"
 hero_supervisor = { path = "../supervisor" }
 hero_job = { path = "../job" }
-# heromodels = { path = "../../../db/heromodels", features = ["rhai"] }
 heromodels = { git = "https://git.ourworld.tf/herocode/db.git" }
-heromodels_core = { path = "../../../db/heromodels_core" }
-heromodels-derive = { path = "../../../db/heromodels-derive" }
-rhailib_dsl = { git = "https://git.ourworld.tf/herocode/rhailib.git" }
+heromodels_core = { git = "https://git.ourworld.tf/herocode/db.git" }
+heromodels-derive = { git = "https://git.ourworld.tf/herocode/db.git" }
 
 [features]
 default = ["calendar", "finance"]