Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
robinhundt committed Mar 25, 2024
1 parent e9c1497 commit 1681096
Show file tree
Hide file tree
Showing 13 changed files with 424 additions and 264 deletions.
545 changes: 354 additions & 191 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exclude = ["libs"]
[workspace.dependencies]
# Use a workspace.forked remoc version which changes the default options for bincode to use varint encoding
remoc = { git = "https://github.com/robinhundt/remoc", rev = "c052a35b2e8fe78daeb06f4686b1d3f29dab7005", default-features = false, features = ["rch", "codec-bincode"]}
clap = { version = "4.4.18", features = ["derive"]}
clap = { version = "4.5.3", features = ["derive"]}

[profile.debug-release]
inherits = "release"
Expand Down
2 changes: 1 addition & 1 deletion crates/bitpolymul-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ links = "bitpolymul"


[build-dependencies]
cc = "1.0.83"
cc = "1.0.90"
8 changes: 4 additions & 4 deletions crates/seec-bitmatrix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ rustversion = "1.0.14"

[dependencies]
bitvec = "1.0.1"
bytemuck = { version = "1.14.1", features = ["extern_crate_alloc"]}
bytemuck = { version = "1.15.0", features = ["extern_crate_alloc"]}
cfg-if = "1.0.0"
rand = "0.8.5"
serde = { version = "1.0.196", features = ["derive"]}
rayon = { version = "1.8.1", optional = true}
serde = { version = "1.0.197", features = ["derive"]}
rayon = { version = "1.10.0", optional = true}

[dev-dependencies]
proptest = "1.4.0"
ndarray = "0.15.6"
num-traits = "0.2.17"
num-traits = "0.2.18"
4 changes: 2 additions & 2 deletions crates/seec-channel-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ proc-macro = true

[dependencies]
md5 = "0.7.0"
syn = { version = "2.0.48"}
syn = { version = "2.0.55"}
quote = "1.0.35"
proc-macro2 = "1.0.78"
proc-macro2 = "1.0.79"
26 changes: 13 additions & 13 deletions crates/seec-channel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
async-trait = "0.1.77"
async-trait = "0.1.79"
async-stream = "0.3.5"
bytes = "1.5.0"
bytes = "1.6.0"
futures = "0.3.30"
pin-project = "1.1.4"
serde = { version = "1.0.196"}
erased-serde = "0.4.2"
thiserror = "1.0.56"
pin-project = "1.1.5"
serde = { version = "1.0.197"}
erased-serde = "0.4.4"
thiserror = "1.0.58"
tokio = { version = "1.36.0", features = ["macros", "net"]}
tokio-serde = { version = "0.9.0", features = ["bincode"]}
tokio-util = { version = "0.7.10", features = ["codec"]}
tracing = { version = "0.1.40" }
remoc = { workspace = true }
seec-channel-macros = {path = "../seec-channel-macros"}
once_cell = "1.19.0"
indexmap = { version = "2.2.2", features = ["serde"]}
serde_json = "1.0.113"
tokio-rustls = "0.25.0"
rustls = "0.22.2"
rustls-pemfile = "2.0.0"
indexmap = { version = "2.2.6", features = ["serde"]}
serde_json = "1.0.114"
tokio-rustls = "0.26.0"
rustls = "0.23.4"
rustls-pemfile = "2.1.1"
rustls-native-certs = "0.7.0"

[dev-dependencies]
criterion = { version = "0.5.1", features = ["async_tokio"] }
serde = { version = "1.0.196", features = ["derive"]}
serde_json = "1.0.113"
serde = { version = "1.0.197", features = ["derive"]}
serde_json = "1.0.114"
tokio = { version = "1.36.0", features = ["rt-multi-thread", "time"]}


Expand Down
4 changes: 2 additions & 2 deletions crates/seec-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ edition = "2021"
proc-macro = true

[dependencies]
syn = { version = "2.0.48"}
syn = { version = "2.0.55"}
quote = "1.0.35"
proc-macro2 = "1.0.78"
proc-macro2 = "1.0.79"
34 changes: 17 additions & 17 deletions crates/seec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,58 +28,58 @@ required-features = ["bench-api"]


[dependencies]
ahash = "0.8.7"
async-trait = "0.1.77"
ahash = "0.8.11"
async-trait = "0.1.79"
async-stream = "0.3.5"
bitvec = { version = "1.0.1", features = ["serde"]}
bytemuck = { version = "1.14.1", features = ["derive"]}
bytemuck = { version = "1.15.0", features = ["derive"]}
bincode = { version = "1.3.3"}
tokio = { version = "1.36.0", features = ["full"]}
futures = "0.3.30"
thiserror = "1.0.56"
pin-project = "1.1.4"
thiserror = "1.0.58"
pin-project = "1.1.5"
nom = "7.1.3"
petgraph = { version = "0.6.4", features = ["serde-1"]}
smallvec = { version = "1.13.1", features = ["union", "const_generics", "serde"]}
smallvec = { version = "1.13.2", features = ["union", "const_generics", "serde"]}
itertools = "0.12.1"
tokio-serde = { version = "0.9.0", features = ["bincode"]}
tokio-util = { version = "0.7.10", features = ["codec"]}
serde = { version = "1.0.196", features = ["derive"]}
serde = { version = "1.0.197", features = ["derive"]}
tracing = "0.1.40"
itoa = "1.0.10"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"], optional = true}
anyhow = { version = "1.0.79", optional = true}
anyhow = { version = "1.0.81", optional = true}
funty = { version = "2.0.0", optional = true}
parking_lot = { version = "0.12.1", features = ["arc_lock"]}
rayon = "1.8.1"
rayon = "1.10.0"
rand = { version = "0.8.5", features = ["std"]}
rand_chacha = "0.3.1"
num-integer = "0.1.45"
num-traits = "0.2.17"
rangemap = "1.4.0"
num-integer = "0.1.46"
num-traits = "0.2.18"
rangemap = "1.5.1"
once_cell = "1.19.0"
seec-macros = {path = "../seec-macros"}
seec-channel = {path = "../seec-channel"}
remoc = { workspace = true }
zappot = {path = "../zappot"}
typemap = "0.3.3"
seec-bitmatrix = {path = "../seec-bitmatrix"}
either = "1.9.0"
either = "1.10.0"
flatbuffers = "23.5.26"

[dev-dependencies]
aes = "0.8.3"
aes = "0.8.4"
cbc = { version = "0.1.2", features = ["alloc", "block-padding"]}
hex = "0.4.3"
hex-literal = "0.4.1"
seec = {path = ".", features = ["_integration_tests"]}
bincode = "1.3.3"
clap = { workspace = true }
tracing-appender = "0.2.3"
base64 = "0.21.7"
serde_yaml = "0.9.31"
base64 = "0.22.0"
serde_yaml = "0.9.34"
criterion = "0.5"
serde_json = "1.0.113"
serde_json = "1.0.114"

[[bench]]
name = "bench_main"
Expand Down
1 change: 0 additions & 1 deletion crates/seec/src/circuit/circuit_connections.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use crate::{GateId, SubCircuitGate};
use petgraph::adj::IndexType;
use serde::{Deserialize, Serialize};
use smallvec::SmallVec;
use std::cmp::{Eq, Ord};
use std::collections::{BTreeMap, Bound, HashMap};
use std::fmt::Debug;
use std::hash::Hash;
Expand Down
2 changes: 0 additions & 2 deletions crates/seec/src/circuit/static_layers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ use crate::protocols::Gate;
use crate::{GateId, SubCircuitGate};
use either::Either;
use serde::{Deserialize, Serialize};
use std::cmp::Eq;
use std::cmp::Ord;
use std::collections::HashMap;
use std::hash::Hash;
use std::num::NonZeroUsize;
Expand Down
57 changes: 29 additions & 28 deletions crates/zappot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,49 +16,50 @@ silent-ot-ex-conv-code = ["libote", "silent-ot"]
silent-ot-libote-codes = ["silent-ot-silver-code", "silent-ot-ea-code", "silent-ot-ex-conv-code"]

[dependencies]
aes = "0.8.3"
async-trait = "0.1.77"
aligned-vec = {path = "../aligned-vec", optional = true}
bitpolymul = {path = "../bitpolymul", optional = true}
aes = "0.8.4"
async-trait = "0.1.79"
aligned-vec = { path = "../aligned-vec", optional = true }
bitpolymul = { path = "../bitpolymul", optional = true }
bitvec = "1.0.1"
bytemuck = { version = "1.14.1", features = ["derive", "extern_crate_alloc"]}
crossbeam-channel = "0.5.11"
curve25519-dalek = { version = "4.1.1", features = ["serde","rand_core","precomputed-tables"]}
futures = { version = "0.3.30", features = ["executor"]}
bytemuck = { version = "1.15.0", features = ["derive", "extern_crate_alloc"] }
crossbeam-channel = "0.5.12"
curve25519-dalek = { version = "4.1.2", features = ["serde", "rand_core", "precomputed-tables"] }
futures = { version = "0.3.30", features = ["executor"] }
rand = "0.8.5"
rand_core = "0.6.4"
rayon = "1.8.1"
serde = { version = "1.0.196", features = ["derive"]}
rayon = "1.10.0"
serde = { version = "1.0.197", features = ["derive"] }
blake2 = "0.10.6"
generic-array = { version = "0.14.7", features = ["serde"]}
pin-project = "1.1.4"
seec-channel = {path = "../seec-channel"}
num-integer = "0.1.45"
num-traits = "0.2.17"
num-prime = {git = "https://github.com/robinhundt/num-prime.git"}
# this currently needs to be kept at 0.14.7, as aes and blake depend on this version
generic-array = { version = "0.14.7", features = ["serde"] }
pin-project = "1.1.5"
seec-channel = { path = "../seec-channel" }
num-integer = "0.1.46"
num-traits = "0.2.18"
num-prime = { git = "https://github.com/robinhundt/num-prime.git" }
once_cell = "1.19.0"
tokio = { version = "1.36.0", features = ["sync", "macros", "net"]}
tokio-serde = { version = "0.9.0", features = ["bincode"]}
tokio-util = { version = "0.7.10", features = ["codec"]}
ndarray = { version = "0.15.6", features = ["rayon"]}
thiserror = "1.0.56"
tokio = { version = "1.36.0", features = ["sync", "macros", "net"] }
tokio-serde = { version = "0.9.0", features = ["bincode"] }
tokio-util = { version = "0.7.10", features = ["codec"] }
ndarray = { version = "0.15.6", features = ["rayon"] }
thiserror = "1.0.58"
tracing = "0.1.40"
remoc = { workspace = true }
libote = { path = "../../libs/libote-rs", optional = true }
seec-bitmatrix = {path = "../seec-bitmatrix", features = ["rayon"]}
seec-bitmatrix = { path = "../seec-bitmatrix", features = ["rayon"] }

[dev-dependencies]
criterion = { version = "0.5.1", features = ["async_tokio"]}
clap = { version = "4.4.18", features = ["derive"]}
tokio = { version = "1.36.0", features = ["full"]}
criterion = { version = "0.5.1", features = ["async_tokio"] }
clap = { version = "4.5.3", features = ["derive"] }
tokio = { version = "1.36.0", features = ["full"] }
ocelot = { git = "https://github.com/GaloisInc/swanky.git" }
scuttlebutt = { git = "https://github.com/GaloisInc/swanky.git" }
rand_core_5_1 = { version = "0.5.1", package = "rand_core"}
tracing-subscriber = { version = "0.3.18", features = ["env-filter"]}
rand_core_5_1 = { version = "0.5.1", package = "rand_core" }
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }


[build-dependencies]
cc = "1.0.83"
cc = "1.0.90"

[[bench]]
name = "bench_main"
Expand Down
1 change: 0 additions & 1 deletion crates/zappot/src/util/aes_rng.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ impl From<AesRngCore> for AesRng {
#[cfg(test)]
mod tests {
use super::*;
use rand::Rng;

#[test]
fn test_generate() {
Expand Down
2 changes: 1 addition & 1 deletion crates/zappot/src/util/tokio_rayon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ mod private {
#[cfg(test)]
mod tests {
use super::*;
use rayon::{ThreadPool, ThreadPoolBuilder};
use rayon::ThreadPoolBuilder;

fn build_thread_pool() -> ThreadPool {
ThreadPoolBuilder::new().num_threads(1).build().unwrap()
Expand Down

0 comments on commit 1681096

Please sign in to comment.