Skip to content

Commit

Permalink
Migrate all dependencies to workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
aspect committed Oct 29, 2023
1 parent 082e25d commit 54907ea
Show file tree
Hide file tree
Showing 31 changed files with 151 additions and 161 deletions.
44 changes: 42 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,48 @@ dashmap = "5.4.0"
separator = "0.4.1"
serde_bytes = "0.11.11"
xxhash-rust = { version = "0.8.6", features = ["xxh3"] }
crossbeam-channel = "0.5.0"
flate2 = "1"
rand_distr = "0.4"
dhat = "0.3.2"
duration-string = "0.2.0"
local-ip-address = "0.5.3"
igd-next = { version = "0.14.2", features = ["aio_tokio"] }
statrs = "0.13.0"
statest = "0.2.2"
triggered = "0.1"
log4rs = "1"
ctrlc = "3.2"
intertrait = "0.2"
once_cell = "1"
keccak = "0.1"
sha3 = "0.10"
cc = "1"
enum-primitive-derive = "0.2.2"
num-traits = "0.2.15"
rlimit = "0.10.1"
dirs = "4.0"
malachite-nz = "0.3"
malachite-base = "0.3"
portable-atomic = {version = "1.4.1", features = ["float"]}
tokio-stream = "0.1.11"
prost = "0.11"
tonic = "0.9.1"
h2 = "0.3"
seqlock = "0.2"
tonic-build = "0.9.1"
event-listener = "2.5.3"
ipnet = "2.8.0"
hex = "0.4.3"
async-stream = "0.3.0"



# bip32 dependencies
rand_core = { version = "0.6", features = ["std"] }
bs58 = { version = "0.4", features = ["check"], default-features = false }
hmac = { version = "0.12", default-features = false }
secp256k1 = { version = "0.24", features = [
secp256k1 = { version = "0.24.0", features = [
"global-context",
"rand-std",
"serde",
Expand All @@ -198,10 +234,14 @@ secp256k1 = { version = "0.24", features = [
zeroize = { version = "1", default-features = false, features = ["alloc"] }
ripemd = { version = "0.1", default-features = false }
subtle = { version = "2", default-features = false }
once_cell = { version = "1" }
pbkdf2 = { version = "0.12.1" }
# pbkdf2 = { version = "0.11", default-features = false}

# workflow dependencies that are not a part of workflow-rs

# workflow-perf-monitor = { path = "../../../workflow-perf-monitor-rs" }
workflow-perf-monitor = { version = "0.0.1" }

# workflow dependencies
workflow-d3 = { version = "0.8.0" }
workflow-nw = { version = "0.8.0" }
Expand Down
8 changes: 4 additions & 4 deletions components/addressmanager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ borsh.workspace = true
log.workspace = true
tokio.workspace = true
thiserror.workspace = true
local-ip-address = "0.5.3"
igd-next = { version = "0.14.2", features = ["aio_tokio"] }
local-ip-address.workspace = true
igd-next.workspace = true

[dev-dependencies]
statrs = "0.13.0"
statest = "0.2.2"
statrs.workspace = true
statest.workspace = true
2 changes: 1 addition & 1 deletion components/connectionmanager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ parking_lot.workspace = true
itertools.workspace = true
rand.workspace = true
futures-util.workspace = true
duration-string = "0.2.0"
duration-string.workspace = true
2 changes: 1 addition & 1 deletion components/consensusmanager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ itertools.workspace = true
rand.workspace = true
futures-util.workspace = true
futures.workspace = true
duration-string = "0.2.0"
duration-string.workspace = true
10 changes: 5 additions & 5 deletions consensus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ kaspa-database.workspace = true
kaspa-consensusmanager.workspace = true
once_cell.workspace = true

crossbeam-channel = "0.5"
crossbeam-channel.workspace = true
async-channel.workspace = true
secp256k1 = { version = "0.24", features = ["global-context", "rand-std"] }
secp256k1.workspace = true

rand = { workspace = true, features = ["small_rng"] }

Expand All @@ -48,9 +48,9 @@ tokio = { workspace = true, features = ["rt", "macros"] }

[dev-dependencies]
criterion.workspace = true
serde_json = "1.0"
flate2 = "1"
rand_distr = "0.4"
serde_json.workspace = true
flate2.workspace = true
rand_distr.workspace = true
kaspa-txscript-errors.workspace = true

[[bench]]
Expand Down
3 changes: 0 additions & 3 deletions consensus/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ rand.workspace = true
workflow-log.workspace = true
workflow-core.workspace = true

# secp256k1 = { version = "0.24", features = ["global-context", "rand-std", "serde"] }
# secp256k1 = { version = "0.24", features = ["global-context", "rand-std"] }

[dev-dependencies]
criterion.workspace = true
bincode.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions consensus/notify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ kaspa-core.workspace = true
kaspa-utils.workspace = true
async-channel.workspace = true
log.workspace = true
futures = "0.3.25"
triggered = "0.1"
futures.workspace = true
triggered.workspace = true
derive_more.workspace = true
paste = "1.0.11"
paste.workspace = true
cfg-if.workspace = true
8 changes: 4 additions & 4 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ log.workspace = true
cfg-if.workspace = true
thiserror.workspace = true
workflow-log.workspace = true
triggered = "0.1"
triggered.workspace = true

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
log4rs = { version = "1", features = ["all_components", "gzip", "background_rotation"] }
log4rs = { workspace = true, features = ["all_components", "gzip", "background_rotation"] }
tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread", "time"] }
ctrlc = { version = "3.2", features = ["termination"] }
intertrait = "0.2"
ctrlc = { workspace = true, features = ["termination"] }
intertrait.workspace = true
num_cpus.workspace = true
14 changes: 7 additions & 7 deletions crypto/hashes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@ no-asm = ["keccak"]
borsh.workspace = true
faster-hex.workspace = true
serde.workspace = true
blake2b_simd = "1"
sha2 = "0.10"
once_cell = "1"
keccak = { version = "0.1", optional = true }
blake2b_simd.workspace = true
sha2.workspace = true
once_cell.workspace = true
keccak = { workspace = true, optional = true }
wasm-bindgen.workspace = true
js-sys.workspace = true
workflow-wasm.workspace = true
kaspa-utils.workspace = true

[target.'cfg(any(target_os = "windows", not(target_arch = "x86_64")))'.dependencies]
keccak = "0.1"
keccak.workspace = true

[dev-dependencies]
criterion.workspace = true
rand.workspace = true
sha3 = "0.10"
sha3.workspace = true

[build-dependencies]
cc = "1"
cc.workspace = true

[[bench]]
name = "bench"
Expand Down
6 changes: 3 additions & 3 deletions crypto/txscript/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sha2.workspace = true
itertools.workspace = true
rand.workspace = true
indexmap.workspace = true
secp256k1 = { version = "0.24", features = ["global-context", "rand-std"] }
secp256k1.workspace = true
parking_lot.workspace = true
kaspa-txscript-errors.workspace = true
smallvec.workspace = true
Expand All @@ -29,8 +29,8 @@ serde.workspace = true
[dev-dependencies]
criterion.workspace = true
smallvec.workspace = true
hex = "0.4"
serde_json = "1.0"
hex.workspace = true
serde_json.workspace = true

[[bench]]
name = "bench"
Expand Down
23 changes: 0 additions & 23 deletions daemon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,3 @@ serde.workspace = true
downcast-rs.workspace = true
kaspa-addresses.workspace = true
kaspa-wallet-core.workspace = true


# async-channel.workspace = true
# uuid.workspace = true
# serde.workspace = true
# borsh.workspace = true
# faster-hex.workspace = true
# smallvec.workspace = true
# itertools.workspace = true

# triggered = "0.1"
# event-listener = "2.5.3"

# [dev-dependencies]
# async-trait.workspace = true
# futures-util.workspace = true
# tokio = { workspace = true, features = ["rt", "time", "macros"] }
# criterion.workspace = true
# rand.workspace = true

# [[bench]]
# name = "bench"
# harness = false
6 changes: 3 additions & 3 deletions database/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ itertools.workspace = true
num_cpus.workspace = true
tempfile.workspace = true

enum-primitive-derive = "0.2.2"
num-traits = "0.2.15"
rlimit = "0.10.1"
enum-primitive-derive.workspace = true
num-traits.workspace = true
rlimit.workspace = true
8 changes: 4 additions & 4 deletions indexes/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ kaspa-consensus-core.workspace = true
kaspa-utils.workspace = true
kaspa-notify.workspace = true
async-channel.workspace = true
async-trait = "0.1.57"
async-trait.workspace = true
log.workspace = true
serde.workspace = true
futures = "0.3.25"
triggered = "0.1"
futures.workspace = true
triggered.workspace = true
derive_more.workspace = true
paste = "1.0.11"
paste.workspace = true

[dev-dependencies]
# parking_lot.workspace = true
Expand Down
8 changes: 4 additions & 4 deletions indexes/processor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ kaspa-consensusmanager.workspace = true

thiserror.workspace = true
async-channel.workspace = true
async-trait = "0.1.57"
async-trait.workspace = true
log.workspace = true
futures = "0.3.25"
triggered = "0.1"
futures.workspace = true
triggered.workspace = true
derive_more.workspace = true
paste = "1.0.11"
paste.workspace = true
tokio = { workspace = true, features = [ "rt-multi-thread", "macros", "signal" ]}

[dev-dependencies]
Expand Down
6 changes: 2 additions & 4 deletions kaspad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread"] }
clap.workspace = true
log.workspace = true
workflow-log.workspace = true
# rand_distr = "0.4"
# num-format = "0.4"
dirs = "4.0"
dirs.workspace = true
num_cpus.workspace = true

dhat = { version = "0.3.2", optional = true }
dhat = { workspace = true, optional = true }

[features]
heap = ["dhat"]
Expand Down
4 changes: 2 additions & 2 deletions math/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ include.workspace = true
serde.workspace = true
faster-hex.workspace = true
borsh.workspace = true
malachite-nz = "0.3"
malachite-base = "0.3"
malachite-nz.workspace = true
malachite-base.workspace = true
wasm-bindgen.workspace = true
serde-wasm-bindgen.workspace = true
js-sys.workspace = true
Expand Down
6 changes: 2 additions & 4 deletions metrics/perf_monitor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ kaspa-core.workspace = true
log.workspace = true
thiserror.workspace = true

# perf_monitor = {version = "0.2.0", git = "https://github.com/larksuite/perf-monitor-rs", rev = "3b2d52768f229c481186b991ae56559ab4cd087a"}
# workflow-perf-monitor = { path = "../../../workflow-perf-monitor-rs" }
workflow-perf-monitor = { version = "0.0.1" }
workflow-perf-monitor.workspace = true
tokio = { workspace = true, features = ["rt", "macros", "time"] }
portable-atomic = {version = "1.4.1", features = ["float"]}
portable-atomic.workspace = true
2 changes: 1 addition & 1 deletion mining/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tokio = { workspace = true, features = [
[dev-dependencies]
kaspa-txscript.workspace = true
criterion.workspace = true
secp256k1 = { version = "0.24", features = ["global-context", "rand-std"] }
secp256k1.workspace = true

[[bench]]
name = "bench"
Expand Down
10 changes: 5 additions & 5 deletions notify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ borsh.workspace = true
async-channel.workspace = true
log.workspace = true
futures-util.workspace = true
async-trait = "0.1.57"
futures = { version = "0.3" }
rand = "0.8"
triggered = "0.1"
async-trait.workspace = true
futures.workspace = true
rand.workspace = true
triggered.workspace = true
workflow-core.workspace = true
paste = "1.0.11"
paste.workspace = true
parking_lot.workspace = true
workflow-log.workspace = true

Expand Down
7 changes: 4 additions & 3 deletions protocol/flows/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ itertools.workspace = true
indexmap.workspace = true
async-trait.workspace = true

futures = { version = "0.3", default-features = false, features = ["alloc"] }
# futures = { workspace = true, default-features = false, features = ["alloc"] }
futures = { workspace = true, features = ["alloc"] }
tokio = { workspace = true, features = [
"rt-multi-thread",
"macros",
"signal",
] }
tokio-stream = { version = "0.1.11", features = ["net"] }
uuid = { version = "1.2.2", features = ["v4", "fast-rng"] }
tokio-stream = { workspace = true, features = ["net"] }
uuid = { workspace = true, features = ["v4", "fast-rng"] }
19 changes: 10 additions & 9 deletions protocol/p2p/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,22 @@ uuid.workspace = true
serde.workspace = true
borsh.workspace = true

futures = { version = "0.3", default-features = false, features = ["alloc"] }
prost = "0.11"
ctrlc = "3.2"
# futures = { workspace = true, default-features = false, features = ["alloc"] }
futures = { workspace = true, features = ["alloc"] }
prost.workspace = true
ctrlc.workspace = true
tokio = { workspace = true, features = [
"rt-multi-thread",
"macros",
"signal",
] }
tokio-stream = { version = "0.1.11", features = ["net"] }
tonic = { version = "0.9.1", features = ["tls", "gzip"] }
h2 = "0.3"
seqlock = "0.2"
tokio-stream = { workspace = true, features = ["net"] }
tonic = { workspace = true, features = ["tls", "gzip"] }
h2.workspace = true
seqlock.workspace = true

[build-dependencies]
tonic-build = { version = "0.9.1", features = ["prost"] }
tonic-build = { workspace = true, features = ["prost"] }

[dev-dependencies]
hex = "0.4.3"
hex.workspace = true
2 changes: 1 addition & 1 deletion rothschild/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ log.workspace = true
faster-hex.workspace = true

tokio = { workspace = true, features = ["rt", "macros", "rt-multi-thread"] }
secp256k1 = { version = "0.24", features = ["global-context", "rand-std"] }
secp256k1 = { workspace = true, features = ["global-context", "rand-std"] }
Loading

0 comments on commit 54907ea

Please sign in to comment.