fix(dre): revert separating lib from canisters (#660)

Co-authored-by: sa-github-api <138766536+sa-github-api@users.noreply.github.com>
dfinity · Jul 25, 2024 · af99bba · af99bba
1 parent 5ba79df
commit af99bba
Show file tree

Hide file tree

Showing 20 changed files with 224 additions and 239 deletions.
diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "0a147d75b6943fe7fce1c7d185a8c1576d83eebf42e9e15a9f046cae1ff72dbb",
+  "checksum": "122ae00e2b90aff46a0aaf1e6e2d80c5729af927eb65d305a5e598b381eed7b1",
   "crates": {
     "actix-codec 0.5.2": {
       "name": "actix-codec",
@@ -17632,9 +17632,12 @@
       "name": "ic-cdk",
       "version": "0.15.0",
       "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/ic-cdk/0.15.0/download",
-          "sha256": "0c44983d6e97135d86132111bae5b86c34c498d96b4f182638bebcc7ac07e03c"
+        "Git": {
+          "remote": "https://github.com/dfinity/cdk-rs.git",
+          "commitish": {
+            "Rev": "59795716487fbb8a9910ac503bcea1e0cb08c932"
+          },
+          "strip_prefix": "src/ic-cdk"
         }
       },
       "targets": [
@@ -17751,9 +17754,12 @@
       "name": "ic-cdk-macros",
       "version": "0.15.0",
       "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/ic-cdk-macros/0.15.0/download",
-          "sha256": "3af44fb4ec3a4b18831c9d3303ca8fa2ace846c4022d50cb8df4122635d3782e"
+        "Git": {
+          "remote": "https://github.com/dfinity/cdk-rs.git",
+          "commitish": {
+            "Rev": "59795716487fbb8a9910ac503bcea1e0cb08c932"
+          },
+          "strip_prefix": "src/ic-cdk-macros"
         }
       },
       "targets": [
@@ -17928,9 +17934,12 @@
       "name": "ic-cdk-timers",
       "version": "0.9.0",
       "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/ic-cdk-timers/0.9.0/download",
-          "sha256": "61fdca8e1d9ffb65ae68019b342c182009de9dc206fd849db0b0e90ee19f6fa4"
+        "Git": {
+          "remote": "https://github.com/dfinity/cdk-rs.git",
+          "commitish": {
+            "Rev": "59795716487fbb8a9910ac503bcea1e0cb08c932"
+          },
+          "strip_prefix": "src/ic-cdk-timers"
         }
       },
       "targets": [
@@ -26138,9 +26147,12 @@
       "name": "ic0",
       "version": "0.23.0",
       "repository": {
-        "Http": {
-          "url": "https://static.crates.io/crates/ic0/0.23.0/download",
-          "sha256": "8de254dd67bbd58073e23dc1c8553ba12fa1dc610a19de94ad2bbcd0460c067f"
+        "Git": {
+          "remote": "https://github.com/dfinity/cdk-rs.git",
+          "commitish": {
+            "Rev": "59795716487fbb8a9910ac503bcea1e0cb08c932"
+          },
+          "strip_prefix": "src/ic0"
         }
       },
       "targets": [
@@ -45872,8 +45884,18 @@
       "name": "trustworthy-node-metrics",
       "version": "0.4.3",
       "repository": null,
-      "targets": [],
-      "library_target_name": null,
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "trustworthy_node_metrics",
+            "crate_root": "src/lib.rs",
+            "srcs": [
+              "**/*.rs"
+            ]
+          }
+        }
+      ],
+      "library_target_name": "trustworthy_node_metrics",
       "common_attrs": {
         "compile_data_glob": [
           "**"
@@ -45888,6 +45910,10 @@
               "id": "candid 0.10.9",
               "target": "candid"
             },
+            {
+              "id": "ciborium 0.2.2",
+              "target": "ciborium"
+            },
             {
               "id": "dfn_core 0.9.0",
               "target": "dfn_core"
@@ -45935,6 +45961,14 @@
             {
               "id": "prost 0.12.6",
               "target": "prost"
+            },
+            {
+              "id": "serde 1.0.204",
+              "target": "serde"
+            },
+            {
+              "id": "serde_json 1.0.120",
+              "target": "serde_json"
             }
           ],
           "selects": {}
@@ -45953,68 +45987,6 @@
       },
       "license": null
     },
-    "trustworthy-node-metrics-types 0.4.3": {
-      "name": "trustworthy-node-metrics-types",
-      "version": "0.4.3",
-      "repository": null,
-      "targets": [
-        {
-          "Library": {
-            "crate_name": "trustworthy_node_metrics_types",
-            "crate_root": "src/lib.rs",
-            "srcs": [
-              "**/*.rs"
-            ]
-          }
-        }
-      ],
-      "library_target_name": "trustworthy_node_metrics_types",
-      "common_attrs": {
-        "compile_data_glob": [
-          "**"
-        ],
-        "deps": {
-          "common": [
-            {
-              "id": "candid 0.10.9",
-              "target": "candid"
-            },
-            {
-              "id": "ciborium 0.2.2",
-              "target": "ciborium"
-            },
-            {
-              "id": "dfn_core 0.9.0",
-              "target": "dfn_core"
-            },
-            {
-              "id": "ic-management-canister-types 0.9.0",
-              "target": "ic_management_canister_types"
-            },
-            {
-              "id": "ic-stable-structures 0.6.5",
-              "target": "ic_stable_structures"
-            },
-            {
-              "id": "itertools 0.13.0",
-              "target": "itertools"
-            },
-            {
-              "id": "serde 1.0.204",
-              "target": "serde"
-            },
-            {
-              "id": "serde_json 1.0.120",
-              "target": "serde_json"
-            }
-          ],
-          "selects": {}
-        },
-        "edition": "2021",
-        "version": "0.4.3"
-      },
-      "license": null
-    },
     "try-lock 0.2.5": {
       "name": "try-lock",
       "version": "0.2.5",
@@ -50390,8 +50362,7 @@
     "service-discovery 0.4.3": "rs/ic-observability/service-discovery",
     "slack-notifications 0.4.3": "rs/slack-notifications",
     "sns-downloader 0.4.3": "rs/ic-observability/sns-downloader",
-    "trustworthy-node-metrics 0.4.3": "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics",
-    "trustworthy-node-metrics-types 0.4.3": "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types"
+    "trustworthy-node-metrics 0.4.3": "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics"
   },
   "conditions": {
     "aarch64-apple-darwin": [

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,6 @@ members = [
     "rs/slack-notifications",
     "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics",
     "rs/qualifier",
-    "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types",
 ]
 
 resolver = "2"
@@ -76,7 +75,7 @@ cryptoki = "0.3.1"
 csv = "1.3.0"
 custom_error = "1.9.2"
 decentralization = { path = "rs/decentralization" }
-trustworthy-node-metrics-types = { path = "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types" }
+trustworthy-node-metrics = { path = "rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics" }
 derive_builder = "0.20.0"
 derive_more = "0.99.18"
 dialoguer = "0.11.0"
@@ -111,7 +110,7 @@ ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412
 ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
 ic-canisters = { path = "rs/ic-canisters" }
 ic-nervous-system-common-test-keys = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
-ic-cdk = "0.15.0"
+ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "59795716487fbb8a9910ac503bcea1e0cb08c932" }
 ic-config = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
 ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
 ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }
@@ -199,8 +198,8 @@ warp = "0.3"
 wiremock = "0.6.0"
 
 # dre-canisters dependencies
-ic-cdk-timers = "0.9"                                                                                      # Feel free to remove this dependency if you don't need timers
-ic-cdk-macros = "0.15.0"
+ic-cdk-timers = { git = "https://github.com/dfinity/cdk-rs.git", rev = "59795716487fbb8a9910ac503bcea1e0cb08c932" }
+ic-cdk-macros = { git = "https://github.com/dfinity/cdk-rs.git", rev = "59795716487fbb8a9910ac503bcea1e0cb08c932" }
 ic-stable-structures = "0.6.5"
 ciborium = "0.2.1"
 dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "5ba1412f9175d987661ae3c0d8dbd1ac3e092b7d" }

diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl
@@ -67,7 +67,6 @@ def external_crates_repository():
             "//rs/rollout-controller:Cargo.toml",
             "//rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics:Cargo.toml",
             "//rs/qualifier:Cargo.toml",
-            "//rs/dre-canisters/trustworthy-node-metrics/src/trustworthy-node-metrics-types:Cargo.toml",
         ],
         splicing_config = splicing_config(
             resolver_version = "2",