allow some type dup to avoid deps

redbadger · Sep 23, 2024 · 8887b62 · 8887b62
1 parent 32d3b1a
commit 8887b62
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git a/wasm-components/rust/Cargo.lock b/wasm-components/rust/Cargo.lock
diff --git a/wasm-components/rust/data-init/Cargo.toml b/wasm-components/rust/data-init/Cargo.toml
@@ -9,5 +9,5 @@ crate-type = ["cdylib"]
 [dependencies]
 serde.workspace = true
 serde_json.workspace = true
-uuid = { version = "1.10.0", features = ["v4"] }
+uuid = { workspace = true, features = ["v4"] }
 wit-bindgen.workspace = true
diff --git a/wasm-components/rust/http-controller/Cargo.toml b/wasm-components/rust/http-controller/Cargo.toml
@@ -9,7 +9,6 @@ crate-type = ["cdylib"]
 [dependencies]
 anyhow.workspace = true
 form_urlencoded = "1.2.1"
-products-service = { version = "0.1.0", path = "../products-service" }
 routefinder = "0.5.4"
 serde.workspace = true
 uuid = { workspace = true, features = ["v4", "serde"] }

diff --git a/wasm-components/rust/http-controller/src/lib.rs b/wasm-components/rust/http-controller/src/lib.rs
@@ -18,7 +18,6 @@ wit_bindgen::generate!({
     generate_all,
 });
 
-use products_service::SerializableProduct;
 use routefinder::Router;
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
@@ -353,6 +352,15 @@ struct SerializableOrder {
     total: Pence,
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct SerializableProduct {
+    pub id: Uuid,
+    pub name: String,
+    pub description: String,
+    pub price: i32,
+    pub sku: String,
+}
+
 impl TryFrom<&Product> for SerializableProduct {
     type Error = anyhow::Error;
 

diff --git a/wasm-components/rust/notification-service/Cargo.toml b/wasm-components/rust/notification-service/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 version = "0.1.0"
 
 [lib]
-crate-type = ["cdylib", "rlib"]
+crate-type = ["cdylib"]
 
 [dependencies]
 serde.workspace = true

diff --git a/wasm-components/rust/notification-service/src/lib.rs b/wasm-components/rust/notification-service/src/lib.rs
@@ -13,8 +13,6 @@ use serde::{Deserialize, Serialize};
 use exports::wasmcloud::messaging::handler::{BrokerMessage, Guest};
 use wasi::logging::logging::{log, Level};
 
-pub const NOTIFICATION_SUBJECT: &str = "platform-poc.order-notification";
-
 struct Component;
 export!(Component);
 
@@ -46,6 +44,6 @@ fn loud_print(msg: &str, data: &str) {
 }
 
 #[derive(Serialize, Deserialize, Default)]
-pub struct OrderNotification {
-    pub order_number: String,
+struct OrderNotification {
+    order_number: String,
 }
diff --git a/wasm-components/rust/orders-service/Cargo.toml b/wasm-components/rust/orders-service/Cargo.toml
@@ -8,7 +8,6 @@ crate-type = ["cdylib"]
 
 [dependencies]
 indoc = "2.0.5"
-notification-service = { version = "0.1.0", path = "../notification-service" }
 serde.workspace = true
 serde_json.workspace = true
 uuid = { workspace = true, features = ["v4"] }

diff --git a/wasm-components/rust/orders-service/src/lib.rs b/wasm-components/rust/orders-service/src/lib.rs
@@ -11,10 +11,10 @@ wit_bindgen::generate!({
     generate_all,
 });
 
-use notification_service::{OrderNotification, NOTIFICATION_SUBJECT};
 use std::collections::HashMap;
 
 use indoc::indoc;
+use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
 use exports::platform_poc::orders::orders::Guest;
@@ -31,6 +31,8 @@ use wasmcloud::{
     },
 };
 
+const NOTIFICATION_SUBJECT: &str = "platform-poc.order-notification";
+
 struct Component;
 export!(Component);
 
@@ -209,3 +211,8 @@ impl Guest for Component {
         Ok(orders)
     }
 }
+
+#[derive(Serialize, Deserialize, Default)]
+struct OrderNotification {
+    pub order_number: String,
+}
diff --git a/wasm-components/rust/products-service/Cargo.toml b/wasm-components/rust/products-service/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 version = "0.1.0"
 
 [lib]
-crate-type = ["cdylib", "rlib"]
+crate-type = ["cdylib"]
 
 [dependencies]
 anyhow.workspace = true