Rewired wasm-rpc dependencies

golemcloud · Dec 10, 2024 · 521afe0 · 521afe0
1 parent 5d6dab1
commit 521afe0
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 64 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,9 @@ members = [
     "golem-worker-service",
     "integration-tests",
     "golem",
-    "wasm-ast"
+    "wasm-ast",
+    "wasm-rpc",
+    "wasm-rpc-stubgen"
 ]
 
 exclude = [
@@ -103,13 +105,11 @@ fred = { version = "9.0.3", features = [
     "serde-json",
     "partial-tracing",
 ] }
+fs_extra = "1.3.0"
 futures = "0.3"
 futures-core = "0.3.29"
 futures-util = "0.3.29"
 git-version = "0.3.9"
-golem-wasm-rpc = { version = "1.1.0", default-features = false, features = [
-    "host",
-] }
 hex = "0.4.3"
 http = "1.0.0" # keep in sync with wasmtime
 http_02 = { package = "http", version = "0.2.11" }
@@ -181,7 +181,7 @@ testcontainers-modules = { version = "0.11.2", features = [
     "redis",
     "minio",
 ] }
-test-r = "1.1.0"
+test-r = { version = "1.1.0", default-features = true }
 thiserror = "1.0.56"
 tokio = { version = "1.0", features = [
     "macros",

diff --git a/golem-api-grpc/Cargo.toml b/golem-api-grpc/Cargo.toml
@@ -12,12 +12,12 @@ harness = false
 
 [dependencies]
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 async-trait = { workspace = true }
 bincode = { workspace = true }
 bytes = { workspace = true }
 futures-core = { workspace = true }
-golem-wasm-rpc = { workspace = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
 serde = { workspace = true }

diff --git a/golem-cli/Cargo.toml b/golem-cli/Cargo.toml
@@ -27,6 +27,8 @@ golem-client = { path = "../golem-client", version = "0.0.0" }
 golem-common = { path = "../golem-common", version = "0.0.0" }
 golem-rib = { path = "../golem-rib", version = "0.0.0" }
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
+golem-wasm-rpc-stubgen = { path = "../wasm-rpc-stubgen", version = "0.0.0", default-features = false, optional = true }
 
 anyhow.workspace = true
 assert2 = { workspace = true }
@@ -44,8 +46,6 @@ dirs = "5.0.1"
 futures-util = { workspace = true }
 glob = "0.3.1"
 golem-examples = "1.1.0"
-golem-wasm-rpc = { workspace = true }
-golem-wasm-rpc-stubgen = { version = "1.1.0", optional = true, default-features = false }
 h2 = "0.3.24"
 http = { workspace = true }
 humansize = { workspace = true }

diff --git a/golem-client/Cargo.toml b/golem-client/Cargo.toml
@@ -15,7 +15,7 @@ harness = false
 [dependencies]
 golem-common = { path = "../golem-common", version = "0.0.0" }
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
-golem-wasm-rpc = { workspace = true }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 async-trait = { workspace = true }
 bytes = { workspace = true }

diff --git a/golem-common/Cargo.toml b/golem-common/Cargo.toml
@@ -13,9 +13,9 @@ harness = false
 
 [dependencies]
 golem-api-grpc = { path = "../golem-api-grpc", version = "0.0.0" }
-golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
-golem-wasm-rpc = { workspace = true }
 golem-rib = { path = "../golem-rib", version = "0.0.0" }
+golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 anyhow = { workspace = true }
 async-trait = { workspace = true }

diff --git a/golem-component-service/Cargo.toml b/golem-component-service/Cargo.toml
@@ -19,7 +19,7 @@ golem-component-service-base = { version = "0.0.0", path = "../golem-component-s
 golem-service-base = { path = "../golem-service-base" }
 golem-rib = {path = "../golem-rib"}
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
-golem-wasm-rpc = { workspace = true }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 anyhow = { workspace = true }
 async-trait = { workspace = true }

diff --git a/golem-rib/Cargo.toml b/golem-rib/Cargo.toml
@@ -10,12 +10,12 @@ description = "Parser for Golem's Rib language"
 [dependencies]
 golem-api-grpc = { path = "../golem-api-grpc", version = "0.0.0" }
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 async-trait = { workspace = true }
 bigdecimal = {workspace = true }
 bincode = { workspace = true }
 combine = { workspace = true }
-golem-wasm-rpc = { workspace = true }
 poem-openapi = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }

diff --git a/golem-service-base/Cargo.toml b/golem-service-base/Cargo.toml
@@ -16,7 +16,7 @@ harness = false
 golem-api-grpc = { path = "../golem-api-grpc", version = "0.0.0" }
 golem-common = { path = "../golem-common", version = "0.0.0" }
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
-golem-wasm-rpc = { workspace = true }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 anyhow = { workspace = true }
 async-fs = { workspace = true }

diff --git a/golem-test-framework/Cargo.toml b/golem-test-framework/Cargo.toml
@@ -15,7 +15,7 @@ golem-api-grpc = { path = "../golem-api-grpc", version = "0.0.0" }
 golem-common = { path = "../golem-common", version = "0.0.0" }
 golem-service-base = { path = "../golem-service-base", version = "0.0.0" }
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
-golem-wasm-rpc = { workspace = true }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 anyhow = { workspace = true }
 async-dropper = { version = "0.3.1", features = ["simple", "tokio"] }

diff --git a/golem-worker-executor-base/Cargo.toml b/golem-worker-executor-base/Cargo.toml
@@ -22,7 +22,7 @@ golem-common = { path = "../golem-common", version = "0.0.0" }
 golem-rib = { path = "../golem-rib", version = "0.0.0" }
 golem-service-base = { path = "../golem-service-base", version = "0.0.0" }
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
-golem-wasm-rpc = { workspace = true }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 anyhow = { workspace = true }
 async-fs = { workspace = true }

diff --git a/golem-worker-executor/Cargo.toml b/golem-worker-executor/Cargo.toml
@@ -19,7 +19,7 @@ test = false
 [dependencies]
 golem-api-grpc = { path = "../golem-api-grpc", version = "0.0.0" }
 golem-common = { path = "../golem-common", version = "0.0.0" }
-golem-wasm-rpc = { workspace = true }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 golem-worker-executor-base = { path = "../golem-worker-executor-base", version = "0.0.0" }
 
 anyhow = { workspace = true }

diff --git a/golem-worker-service-base/Cargo.toml b/golem-worker-service-base/Cargo.toml
@@ -24,7 +24,7 @@ golem-api-grpc = { path = "../golem-api-grpc" }
 golem-service-base = { path = "../golem-service-base" }
 golem-rib = { path = "../golem-rib" }
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
-golem-wasm-rpc = { workspace = true }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 anyhow = { workspace = true }
 async-trait = { workspace = true }

diff --git a/golem-worker-service/Cargo.toml b/golem-worker-service/Cargo.toml
@@ -23,7 +23,7 @@ golem-common = { path = "../golem-common" }
 golem-service-base = { path = "../golem-service-base" }
 golem-rib = {path = "../golem-rib"}
 golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
-golem-wasm-rpc = { workspace = true }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 golem-worker-service-base = { path = "../golem-worker-service-base" }
 
 anyhow = { workspace = true }

diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -13,14 +13,14 @@ autotests = false
 golem-api-grpc = { path = "../golem-api-grpc", version = "0.0.0" }
 golem-common = { path = "../golem-common", version = "0.0.0" }
 golem-test-framework = { path = "../golem-test-framework", version = "0.0.0" }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 
 anyhow = { workspace = true }
 assert2 = { workspace = true }
 async-trait = { workspace = true }
 axum = { workspace = true }
 clap = { workspace = true }
 console-subscriber = { workspace = true }
-golem-wasm-rpc = { workspace = true }
 plotters = "0.3.6"
 poem = { workspace = true }
 rand = { workspace = true }

diff --git a/wasm-rpc-stubgen/Cargo.toml b/wasm-rpc-stubgen/Cargo.toml
@@ -40,8 +40,8 @@ colored = "2.1.0"
 dir-diff = "0.3.3"
 fs_extra = { workspace = true }
 glob = "0.3.1"
-golem-wasm-ast = { workspace = true }
-golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0" }
+golem-wasm-ast = { path = "../wasm-ast", version = "0.0.0" }
+golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0", default-features = false, features = ["host"] }
 heck = "0.5.0"
 id-arena = "2.2.1"
 indexmap = "2.2.6"