Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: define all workspace members in workspace dependencies #1388

Merged
merged 1 commit into from
Jan 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,46 @@ exclude = [
]

[workspace.dependencies]
fluence-libp2p = { path = "crates/libp2p" }
ctrlc-adapter = { path = "crates/ctrlc-adapter" }
control-macro = { path = "crates/control-macro" }
waiting-queues = { path = "crates/waiting-queues" }
local-vm = { path = "crates/local-vm" }
uuid-utils = { path = "crates/uuid-utils" }
test-utils = { path = "crates/test-utils" }
fs-utils = { path = "crates/fs-utils" }
log-utils = { path = "crates/log-utils" }
config-utils = { path = "crates/config-utils" }
service-modules = { path = "crates/service-modules" }
ivalue-utils = { path = "crates/ivalue-utils" }
particle-args = { path = "crates/particle-args" }
json-utils = { path = "crates/json-utils" }
server-config = { path = "crates/server-config" }
kademlia = { path = "crates/kademlia" }
async-unlock = { path = "crates/async-unlock" }
now-millis = { path = "crates/now-millis" }
toml-utils = { path = "crates/toml-utils" }
air-interpreter-fs = { path = "crates/air-interpreter-fs" }
builtins-deployer = { path = "crates/builtins-deployer" }
created-swarm = { path = "crates/created-swarm" }
toy-vms = { path = "crates/toy-vms" }
connected-client = { path = "crates/connected-client" }
test-constants = { path = "crates/test-constants" }
peer-metrics = { path = "crates/peer-metrics" }
spell-event-bus = { path = "crates/spell-event-bus" }
sorcerer = { path = "sorcerer" }
builtins = { path = "particle-node/tests/builtins" }
particle-node = { path = "particle-node" }
aquamarine = { path = "aquamarine" }
particle-protocol = { path = "particle-protocol" }
particle-services = { path = "particle-services" }
particle-builtins = { path = "particle-builtins" }
particle-modules = { path = "particle-modules" }
connection-pool = { path = "connection-pool" }
script-storage = { path = "script-storage" }
spell-storage = { path = "spell-storage" }
particle-execution = { path = "particle-execution" }

fluence-spell-dtos = "0.1.4"
fluence-spell-distro = "0.3.0"
fluence-app-service = "0.23.0"
Expand Down
22 changes: 11 additions & 11 deletions aquamarine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
particle-protocol = { path = "../particle-protocol"}
particle-services = { path = "../particle-services"}
particle-builtins = { path = "../particle-builtins" }
particle-protocol = { workspace = true }
particle-services = { workspace = true }
particle-builtins = { workspace = true }

now-millis = { path = "../crates/now-millis" }
fluence-libp2p = { path = "../crates/libp2p" }
config-utils = { path = "../crates/config-utils" }
particle-args = { path = "../crates/particle-args" }
control-macro = { path = "../crates/control-macro" }
fs-utils = { path = "../crates/fs-utils" }
peer-metrics = { path = "../crates/peer-metrics" }
particle-execution = { path = "../particle-execution" }
now-millis = { workspace = true }
fluence-libp2p = { workspace = true }
config-utils = { workspace = true }
particle-args = { workspace = true }
control-macro = { workspace = true }
fs-utils = { workspace = true }
peer-metrics = { workspace = true }
particle-execution = { workspace = true }

avm-server = { workspace = true }
libp2p = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions connection-pool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
particle-protocol = { path = "../particle-protocol"}
fluence-libp2p = { path = "../crates/libp2p" }
peer-metrics = { path = "../crates/peer-metrics" }
particle-protocol = { workspace = true }
fluence-libp2p = { workspace = true }
peer-metrics = { workspace = true }

libp2p = { workspace = true }

Expand Down
22 changes: 11 additions & 11 deletions crates/builtins-deployer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
particle-modules = { path = "../../particle-modules" }
particle-protocol = { path = "../../particle-protocol" }
particle-execution = { path = "../../particle-execution" }
particle-args = { path = "../particle-args" }
aquamarine = { path = "../../aquamarine" }
service-modules = { path = "../service-modules" }
local-vm = { path = "../local-vm" }
fs-utils = { path = "../fs-utils" }
uuid-utils = { path = "../uuid-utils" }
now-millis = { path = "../now-millis" }
fluence-libp2p = { path = "../libp2p" }
particle-modules = { workspace = true }
particle-protocol = { workspace = true }
particle-execution = { workspace = true }
particle-args = { workspace = true }
aquamarine = { workspace = true }
service-modules = { workspace = true }
local-vm = { workspace = true }
fs-utils = { workspace = true }
uuid-utils = { workspace = true }
now-millis = { workspace = true }
fluence-libp2p = { workspace = true }

futures = { workspace = true }
parking_lot = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions crates/connected-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
particle-protocol = { path = "../../particle-protocol" }
fluence-libp2p = { path = "../libp2p" }
test-constants = { path = "../test-constants"}
local-vm = { path = "../local-vm"}
particle-protocol = { workspace = true }
fluence-libp2p = { workspace = true }
test-constants = { workspace = true }
local-vm = { workspace = true }

fluence-keypair = { workspace = true }
libp2p = { workspace = true }
Expand Down
30 changes: 15 additions & 15 deletions crates/created-swarm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
test-constants = { path = "../test-constants" }
particle-execution = { path = "../../particle-execution" }
particle-args = { path = "../particle-args" }
config-utils = { path = "../config-utils" }
server-config = { path = "../server-config" }
fluence-libp2p = { path = "../libp2p" }
particle-node = { path = "../../particle-node" }
particle-protocol = { path = "../../particle-protocol" }
aquamarine = { path = "../../aquamarine" }
connection-pool = { path = "../../connection-pool" }
script-storage = { path = "../../script-storage" }
fs-utils = { path = "../fs-utils" }
air-interpreter-fs = { path = "../air-interpreter-fs" }
builtins-deployer = { path = "../builtins-deployer" }
toy-vms = { path = "../toy-vms" }
test-constants = { workspace = true }
particle-execution = { workspace = true }
particle-args = { workspace = true }
config-utils = { workspace = true }
server-config = { workspace = true }
fluence-libp2p = { workspace = true }
particle-node = { workspace = true }
particle-protocol = { workspace = true }
aquamarine = { workspace = true }
connection-pool = { workspace = true }
script-storage = { workspace = true }
fs-utils = { workspace = true }
air-interpreter-fs = { workspace = true }
builtins-deployer = { workspace = true }
toy-vms = { workspace = true }

fluence-keypair = { workspace = true }

Expand Down
8 changes: 4 additions & 4 deletions crates/kademlia/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
particle-protocol = { path = "../../particle-protocol" }
particle-protocol = { workspace = true }

control-macro = { path = "../control-macro" }
fluence-libp2p = { path = "../libp2p" }
server-config = { path = "../server-config" }
control-macro = { workspace = true }
fluence-libp2p = { workspace = true }
server-config = { workspace = true }

libp2p = { workspace = true }
libp2p-metrics = { workspace = true, features = ["kad"] }
Expand Down
18 changes: 9 additions & 9 deletions crates/local-vm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
ivalue-utils = { path = "../ivalue-utils" }
particle-args = { path = "../particle-args" }
particle-protocol = { path = "../../particle-protocol" }
particle-execution = { path = "../../particle-execution" }
now-millis = { path = "../now-millis"}
uuid-utils = { path = "../uuid-utils" }
fs-utils = { path = "../fs-utils"}
aquamarine = { path = "../../aquamarine"}
air-interpreter-fs = { path = "../air-interpreter-fs" }
ivalue-utils = { workspace = true }
particle-args = { workspace = true }
particle-protocol = { workspace = true }
particle-execution = { workspace = true }
now-millis = { workspace = true }
uuid-utils = { workspace = true }
fs-utils = { workspace = true }
aquamarine = { workspace = true }
air-interpreter-fs = { workspace = true }

air-interpreter-wasm = { workspace = true }
avm-server = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions crates/particle-args/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
ivalue-utils = { path = "../ivalue-utils" }
json-utils = { path = "../json-utils" }
control-macro = { path = "../control-macro" }
ivalue-utils = { workspace = true }
json-utils = { workspace = true }
control-macro = { workspace = true }

avm-server = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion crates/peer-metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ prometheus-client = { workspace = true }
log = { workspace = true }
bytesize = "1.1.0"
fluence-app-service = { workspace = true }
fluence-libp2p = { path = "../libp2p" }
fluence-libp2p = { workspace = true }
folex marked this conversation as resolved.
Show resolved Hide resolved
async-std = { workspace = true }
futures = { workspace = true }
serde = { version = "1.0.145", features = ["derive"] }
Expand Down
12 changes: 6 additions & 6 deletions crates/server-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
config-utils = { path = "../config-utils" }
fs-utils = { path = "../fs-utils" }
particle-protocol = { path = "../../particle-protocol"}
fluence-libp2p = { path = "../libp2p" }
air-interpreter-fs = { path = "../air-interpreter-fs" }
peer-metrics = { path = "../peer-metrics"}
config-utils = { workspace = true }
fs-utils = { workspace = true }
particle-protocol = { workspace = true }
fluence-libp2p = { workspace = true }
air-interpreter-fs = { workspace = true }
peer-metrics = { workspace = true }

fluence-keypair = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion crates/service-modules/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
fs-utils = { path = "../fs-utils" }
fs-utils = { workspace = true }

eyre = { workspace = true }
serde = { version = "1.0.145", features = ["derive"] }
Expand Down
16 changes: 8 additions & 8 deletions crates/spell-event-bus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
particle-services = { path = "../../particle-services"}
particle-args = { path = "../particle-args" }
uuid-utils = { path = "../uuid-utils" }
now-millis = { path = "../now-millis" }
particle-execution = { path = "../../particle-execution" }
connection-pool = { path = "../../connection-pool"}
fluence-libp2p = { path = "../libp2p" }
particle-services = { workspace = true }
particle-args = { workspace = true }
uuid-utils = { workspace = true }
now-millis = { workspace = true }
particle-execution = { workspace = true }
connection-pool = { workspace = true }
fluence-libp2p = { workspace = true }

parking_lot = { workspace = true }
serde_json = { workspace = true }
Expand All @@ -26,5 +26,5 @@ fluence-spell-dtos = { workspace = true }

[dev-dependencies]
libp2p = { workspace = true }
particle-protocol = { path = "../../particle-protocol"}
particle-protocol = { workspace = true }
maplit = { workspace = true }
12 changes: 6 additions & 6 deletions crates/test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
ivalue-utils = { path = "../ivalue-utils" }
particle-args = { path = "../particle-args" }
connected-client = { path = "../connected-client" }
created-swarm = { path = "../created-swarm" }
test-constants = { path = "../test-constants" }
service-modules = { path = "../service-modules" }
ivalue-utils = { workspace = true }
particle-args = { workspace = true }
connected-client = { workspace = true }
created-swarm = { workspace = true }
test-constants = { workspace = true }
service-modules = { workspace = true }

async-std = { workspace = true }
serde_json = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions crates/toy-vms/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
aquamarine = { path = "../../aquamarine" }
particle-protocol = { path = "../../particle-protocol" }
fluence-libp2p = { path = "../libp2p" }
aquamarine = { workspace = true }
particle-protocol = { workspace = true }
fluence-libp2p = { workspace = true }

avm-server = { workspace = true }

Expand Down
28 changes: 14 additions & 14 deletions particle-builtins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
particle-protocol = { path = "../particle-protocol"}
particle-execution = { path = "../particle-execution"}
particle-services = { path = "../particle-services"}
particle-modules = { path = "../particle-modules"}
connection-pool = { path = "../connection-pool"}
script-storage = { path = "../script-storage"}
particle-protocol = { workspace = true }
particle-execution = { workspace = true }
particle-services = { workspace = true }
particle-modules = { workspace = true }
connection-pool = { workspace = true }
script-storage = { workspace = true }

server-config = { path = "../crates/server-config"}
kademlia = { path = "../crates/kademlia"}
particle-args = { path = "../crates/particle-args" }
ivalue-utils = { path = "../crates/ivalue-utils" }
now-millis = { path = "../crates/now-millis" }
toml-utils = { path = "../crates/toml-utils" }
peer-metrics = { path = "../crates/peer-metrics" }
uuid-utils = { path = "../crates/uuid-utils" }
server-config = { workspace = true }
kademlia = { workspace = true }
particle-args = { workspace = true }
ivalue-utils = { workspace = true }
now-millis = { workspace = true }
toml-utils = { workspace = true }
peer-metrics = { workspace = true }
uuid-utils = { workspace = true }

libp2p = { workspace = true }
avm-server = { workspace = true }
Expand Down
10 changes: 5 additions & 5 deletions particle-execution/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ version = "0.1.0"
edition = "2018"

[dependencies]
particle-protocol = { path = "../particle-protocol" }
particle-protocol = { workspace = true }

particle-args = { path = "../crates/particle-args" }
fluence-libp2p = { path = "../crates/libp2p" }
fs-utils = { path = "../crates/fs-utils" }
json-utils = { path = "../crates/json-utils" }
particle-args = { workspace = true }
fluence-libp2p = { workspace = true }
fs-utils = { workspace = true }
json-utils = { workspace = true }

thiserror = { workspace = true }
futures = { workspace = true }
Expand Down
12 changes: 6 additions & 6 deletions particle-modules/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Fluence Labs"]
edition = "2018"

[dependencies]
particle-execution = { path = "../particle-execution" }
particle-execution = { workspace = true }

particle-args = { path = "../crates/particle-args" }
json-utils = { path = "../crates/json-utils" }
fs-utils = { path = "../crates/fs-utils" }
service-modules = { path = "../crates/service-modules" }
particle-args = { workspace = true }
json-utils = { workspace = true }
fs-utils = { workspace = true }
service-modules = { workspace = true }

marine-it-parser = "0.11.1"
fluence-app-service = { workspace = true }
Expand All @@ -29,4 +29,4 @@ bytesize = "1.1.0"

[dev-dependencies]
tempdir = "0.3.7"
server-config = { path = "../crates/server-config" }
server-config = { workspace = true }
Loading