fix: reference intra-workspace dependencies by their path (#1319)

drahnr · web-flow · commit 89b0c902ffae · 2025-03-18T15:35:42.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -182,16 +182,6 @@ text-tables = "0.3.1"
 url = { version = "2.4.1", features = ["serde"] }
 zeroize = "1.6"
 
-# Workspace deps
-ipc-api = { path = "ipc/api" }
-ipc-provider = { path = "ipc/provider" }
-ipc-wallet = { path = "ipc/wallet", features = ["with-ethers"] }
-ipc_ipld_resolver = { path = "ipld/resolver" }
-ipc-types = { path = "ipc/types" }
-ipc-observability = { path = "ipc/observability" }
-ipc_actors_abis = { path = "contract-bindings" }
-actors-custom-api = { path = "fendermint/actors/api" }
-
 # Vendored for cross-compilation, see https://github.com/cross-rs/cross/wiki/Recipes#openssl
 # Make sure every top level build target actually imports this dependency, and don't end up
 # depending on the same _without_ the "vendored" feature, because then the Docker build for
diff --git a/fendermint/actors/gas_market/eip1559/Cargo.toml b/fendermint/actors/gas_market/eip1559/Cargo.toml
@@ -14,7 +14,7 @@ crate-type = ["cdylib", "lib"]
 [dependencies]
 anyhow = { workspace = true }
 cid = { workspace = true }
-actors-custom-api = { workspace = true }
+actors-custom-api = { path = "../../api" }
 fil_actors_runtime = { workspace = true }
 fvm_ipld_blockstore = { workspace = true }
 fvm_ipld_encoding = { workspace = true }
diff --git a/fendermint/app/Cargo.toml b/fendermint/app/Cargo.toml
@@ -77,10 +77,10 @@ fvm_ipld_blockstore = { workspace = true }
 fvm_ipld_car = { workspace = true }
 fvm_ipld_encoding = { workspace = true }
 fvm_shared = { workspace = true }
-ipc-api = { workspace = true }
-ipc-provider = { workspace = true }
-ipc_ipld_resolver = { workspace = true }
-ipc-observability = { workspace = true }
+ipc-api = { path = "../../ipc/api" }
+ipc-provider = { path = "../../ipc/provider" }
+ipc_ipld_resolver = { path = "../../ipld/resolver" }
+ipc-observability = { path = "../../ipc/observability" }
 
 [dev-dependencies]
 tempfile = { workspace = true }
diff --git a/fendermint/app/options/Cargo.toml b/fendermint/app/options/Cargo.toml
@@ -23,10 +23,10 @@ tracing-subscriber = { workspace = true }
 cid = { workspace = true }
 fvm_ipld_encoding = { workspace = true }
 fvm_shared = { workspace = true }
-ipc-api = { workspace = true }
-ipc-types = { workspace = true }
+ipc-api = { path = "../../../ipc/api" }
+ipc-types = { path = "../../../ipc/types" }
 url = { workspace = true }
-ipc-observability = { workspace = true }
+ipc-observability = { path = "../../../ipc/observability" }
 
 fendermint_vm_genesis = { path = "../../vm/genesis" }
 fendermint_vm_actor_interface = { path = "../../vm/actor_interface" }
diff --git a/fendermint/app/settings/Cargo.toml b/fendermint/app/settings/Cargo.toml
@@ -26,9 +26,9 @@ tracing = { workspace = true }
 
 fvm_shared = { workspace = true }
 fvm_ipld_encoding = { workspace = true }
-ipc-api = { workspace = true }
-ipc-provider = { workspace = true }
-ipc-observability = { workspace = true }
+ipc-api = { path = "../../../ipc/api" }
+ipc-provider = { path = "../../../ipc/provider" }
+ipc-observability = { path = "../../../ipc/observability" }
 
 fendermint_vm_encoding = { path = "../../vm/encoding" }
 fendermint_vm_topdown = { path = "../../vm/topdown" }
diff --git a/fendermint/testing/Cargo.toml b/fendermint/testing/Cargo.toml
@@ -24,7 +24,7 @@ rand = { workspace = true, optional = true }
 cid = { workspace = true, optional = true }
 fvm_ipld_encoding = { workspace = true, optional = true }
 fvm_shared = { workspace = true, optional = true, features = ["arb"] }
-ipc-api = { workspace = true, optional = true }
+ipc-api = { path = "../../ipc/api", optional = true }
 fs-err = { workspace = true }
 
 [dev-dependencies]
diff --git a/fendermint/testing/contract-test/Cargo.toml b/fendermint/testing/contract-test/Cargo.toml
@@ -22,10 +22,10 @@ tokio = { workspace = true }
 byteorder = { workspace = true }
 fvm_ipld_encoding = { workspace = true }
 
-ipc-api = { workspace = true }
-ipc_actors_abis = { workspace = true }
+ipc-api = { path = "../../../ipc/api" }
+ipc_actors_abis = { path = "../../../contract-bindings" }
 
-actors-custom-api = { workspace = true }
+actors-custom-api = { path = "../../actors/api" }
 fendermint_testing = { path = "..", features = ["smt", "arb"] }
 fendermint_crypto = { path = "../../crypto" }
 fendermint_vm_actor_interface = { path = "../../vm/actor_interface" }
diff --git a/fendermint/vm/actor_interface/Cargo.toml b/fendermint/vm/actor_interface/Cargo.toml
@@ -26,8 +26,8 @@ fvm_ipld_hamt = { workspace = true }
 fvm_ipld_blockstore = { workspace = true }
 
 fil_actors_evm_shared = { workspace = true }
-ipc_actors_abis = { workspace = true }
-ipc-api = { workspace = true }
+ipc_actors_abis = { path = "../../../contract-bindings" }
+ipc-api = { path = "../../../ipc/api" }
 
 # The following is disabled so its dependency on an earlier version of fvm_shared doesn't
 # stop us from using the latest version of the FVM. It can be re-enabled if there are more
diff --git a/fendermint/vm/encoding/Cargo.toml b/fendermint/vm/encoding/Cargo.toml
@@ -14,4 +14,4 @@ num-traits = { workspace = true }
 
 cid = { workspace = true }
 fvm_shared = { workspace = true }
-ipc-api = { workspace = true }
+ipc-api = { path = "../../../ipc/api" }
diff --git a/fendermint/vm/genesis/Cargo.toml b/fendermint/vm/genesis/Cargo.toml
@@ -21,7 +21,7 @@ tendermint = { workspace = true }
 cid = { workspace = true, optional = true }
 multihash = { workspace = true, optional = true }
 fvm_shared = { workspace = true }
-ipc-api = { workspace = true }
+ipc-api = { path = "../../../ipc/api" }
 fendermint_actor_eam = { workspace = true }
 
 fendermint_crypto = { path = "../../crypto" }
@@ -34,7 +34,7 @@ quickcheck = { workspace = true }
 quickcheck_macros = { workspace = true }
 hex = { workspace = true }
 serde_json = { workspace = true }
-ipc-types = {workspace = true}
+ipc-types = { path = "../../../ipc/types"}
 
 # Enable arb on self for tests.
 fendermint_vm_genesis = { path = ".", features = ["arb"] }
diff --git a/fendermint/vm/interpreter/Cargo.toml b/fendermint/vm/interpreter/Cargo.toml
@@ -9,7 +9,7 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-actors-custom-api = { workspace = true }
+actors-custom-api = { path = "../../actors/api" }
 fendermint_vm_actor_interface = { path = "../actor_interface" }
 fendermint_vm_core = { path = "../core" }
 fendermint_vm_event = { path = "../event" }
@@ -28,10 +28,10 @@ fendermint_actor_activity_tracker = { path = "../../actors/activity-tracker" }
 fendermint_actor_gas_market_eip1559 = { path = "../../actors/gas_market/eip1559" }
 fendermint_actor_eam = { workspace = true }
 fendermint_testing = { path = "../../testing", optional = true }
-ipc_actors_abis = { workspace = true }
+ipc_actors_abis = { path = "../../../contract-bindings" }
 
-ipc-api = { workspace = true }
-ipc-observability = { workspace = true }
+ipc-api = { path = "../../../ipc/api" }
+ipc-observability = { path = "../../../ipc/observability" }
 
 async-trait = { workspace = true }
 async-stm = { workspace = true }
diff --git a/fendermint/vm/message/Cargo.toml b/fendermint/vm/message/Cargo.toml
@@ -24,7 +24,7 @@ rand = { workspace = true, optional = true }
 cid = { workspace = true }
 fvm_shared = { workspace = true, features  = ["crypto"] }
 fvm_ipld_encoding = { workspace = true }
-ipc-api = { workspace = true }
+ipc-api = { path = "../../../ipc/api" }
 
 fendermint_crypto = { path = "../../crypto" }
 fendermint_vm_encoding = { path = "../encoding" }
diff --git a/fendermint/vm/resolver/Cargo.toml b/fendermint/vm/resolver/Cargo.toml
@@ -16,8 +16,8 @@ tracing = { workspace = true }
 tokio = { workspace = true }
 
 cid = { workspace = true }
-ipc-api = { workspace = true }
-ipc_ipld_resolver = { workspace = true }
+ipc-api = { path = "../../../ipc/api" }
+ipc_ipld_resolver = { path = "../../../ipld/resolver" }
 
 [dev-dependencies]
 tokio = { workspace = true }
diff --git a/fendermint/vm/topdown/Cargo.toml b/fendermint/vm/topdown/Cargo.toml
@@ -17,10 +17,10 @@ fvm_ipld_encoding = { workspace = true }
 fvm_shared = { workspace = true }
 hex = { workspace = true }
 im = { workspace = true }
-ipc_actors_abis = { workspace = true }
-ipc_ipld_resolver = { workspace = true }
-ipc-api = { workspace = true }
-ipc-provider = { workspace = true }
+ipc_actors_abis = { path = "../../../contract-bindings" }
+ipc_ipld_resolver = { path = "../../../ipld/resolver" }
+ipc-api = { path = "../../../ipc/api" }
+ipc-provider = { path = "../../../ipc/provider" }
 libp2p = { workspace = true }
 num-traits = { workspace = true }
 serde = { workspace = true }
@@ -35,7 +35,7 @@ fendermint_vm_genesis = { path = "../genesis" }
 fendermint_vm_event = { path = "../event" }
 fendermint_tracing = { path = "../../tracing" }
 
-ipc-observability = { workspace = true }
+ipc-observability = { path = "../../../ipc/observability" }
 
 [dev-dependencies]
 arbitrary = { workspace = true }
diff --git a/ipc/api/Cargo.toml b/ipc/api/Cargo.toml
@@ -29,8 +29,8 @@ ethers = { workspace = true }
 tracing = { workspace = true }
 serde_with = { workspace = true, features = ["hex"] }
 
-ipc_actors_abis = { workspace = true }
-ipc-types = { workspace = true }
+ipc_actors_abis = { path = "../../contract-bindings" }
+ipc-types = { path = "../../ipc/types" }
 merkle-tree-rs = { path = "../../ext/merkle-tree-rs" }
 
 [dev-dependencies]
diff --git a/ipc/cli/Cargo.toml b/ipc/cli/Cargo.toml
@@ -45,8 +45,8 @@ zeroize = "1.6.0"
 prometheus = { workspace = true }
 prometheus_exporter = { workspace = true }
 
-ipc-wallet = { workspace = true }
-ipc-provider = { workspace = true }
-ipc-api = { workspace = true }
-ipc-types = { workspace = true }
+ipc-wallet = { path = "../../ipc/wallet", features = ["with-ethers"] }
+ipc-provider = { path = "../../ipc/provider" }
+ipc-api = { path = "../../ipc/api" }
+ipc-types = { path = "../../ipc/types" }
 tracing-subscriber.workspace = true
diff --git a/ipc/provider/Cargo.toml b/ipc/provider/Cargo.toml
@@ -47,11 +47,11 @@ fvm_shared = { workspace = true, features  = ["crypto"] }
 
 merkle-tree-rs = { path = "../../ext/merkle-tree-rs" }
 
-ipc-types = { workspace = true }
-ipc-wallet = { workspace = true, features = ["with-ethers"] }
-ipc-api = { workspace = true }
-ipc_actors_abis = { workspace = true }
-ipc-observability = { workspace = true }
+ipc-types = { path = "../../ipc/types" }
+ipc-wallet = { path = "../../ipc/wallet", features = ["with-ethers"] }
+ipc-api = { path = "../../ipc/api" }
+ipc_actors_abis = { path = "../../contract-bindings" }
+ipc-observability = { path = "../../ipc/observability" }
 prometheus = { workspace = true }
 
 [dev-dependencies]
diff --git a/ipc/wallet/Cargo.toml b/ipc/wallet/Cargo.toml
@@ -29,7 +29,7 @@ thiserror = { workspace = true }
 xsalsa20poly1305 = "0.9"
 zeroize = "1.6.0"
 
-ipc-types = { workspace = true }
+ipc-types = { path = "../../ipc/types" }
 
 [dev-dependencies]
 tempfile = { workspace = true }
diff --git a/ipld/resolver/Cargo.toml b/ipld/resolver/Cargo.toml
@@ -33,7 +33,7 @@ fvm_shared = { workspace = true }
 fvm_ipld_blockstore = { workspace = true, optional = true }
 
 ipc-api = { path = "../../ipc/api", default-features = false }
-ipc-observability = { workspace = true }
+ipc-observability = { path = "../../ipc/observability" }
 gcra = { workspace = true }
 
 [dev-dependencies]
