use the workspace deps in xmtp_mls

xmtp · Mar 25, 2024 · 4556c73 · 4556c73
1 parent 46bcd20
commit 4556c73
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev/build_validation_service_local b/dev/build_validation_service_local
@@ -8,9 +8,9 @@ if [ ! -x "$(command -v x86_64-linux-gnu-gcc)" ] && [ "$(uname)" = "Darwin" ]; t
     brew install x86_64-unknown-linux-gnu    
 fi
 
-rustup target add x86_64-unknown-linux-gnu
-export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc
-cargo build --release --package mls_validation_service --target x86_64-unknown-linux-gnu
-mkdir -p .cache
-cp -f ./target/x86_64-unknown-linux-gnu/release/mls-validation-service ./.cache/mls-validation-service
-docker build --platform=linux/amd64 -t xmtp/mls-validation-service:latest -f ./dev/validation_service/local.Dockerfile .
+# rustup target add x86_64-unknown-linux-gnu
+# export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc
+# cargo build --release --package mls_validation_service --target x86_64-unknown-linux-gnu
+# mkdir -p .cache
+# cp -f ./target/x86_64-unknown-linux-gnu/release/mls-validation-service ./.cache/mls-validation-service
+# docker build --platform=linux/amd64 -t xmtp/mls-validation-service:latest -f ./dev/validation_service/local.Dockerfile .
diff --git a/dev/up b/dev/up
@@ -14,7 +14,7 @@ if [[ "${OSTYPE}" == "darwin"* ]]; then
     if ! swiftformat -version &>/dev/null; then brew install swiftformat; fi
 fi
 
-rustup update
+# rustup update
 
 dev/build_validation_service_local
 dev/docker/up
diff --git a/xmtp_mls/Cargo.toml b/xmtp_mls/Cargo.toml
@@ -15,34 +15,33 @@ native = ["libsqlite3-sys/bundled-sqlcipher-vendored-openssl"]
 types = []
 
 [dependencies]
-anyhow = "1.0.71"
-async-trait = "0.1.68"
-chrono = "0.4.31"
 diesel = { version = "2.1.3", features = [
     "sqlite",
     "r2d2",
     "returning_clauses_for_sqlite_3_35",
 ] }
 diesel_migrations = { version = "2.1.0", features = ["sqlite"] }
-ethers = "2.0.4"
-ethers-core = "2.0.4"
-futures = "0.3.28"
-hex = "0.4.3"
-libsqlite3-sys = { version = "0.26.0", optional = true }
-log = "0.4.17"
+async-trait.workspace = true
+ethers.workspace = true
+ethers-core.workspace = true 
+futures.workspace = true 
+hex.workspace = true
+log.workspace = true 
 openmls = { workspace = true, features = ["test-utils"] }
 openmls_basic_credential = { workspace = true }
 openmls_rust_crypto = { workspace = true }
 openmls_traits = { workspace = true }
-prost = { version = "^0.12", features = ["prost-derive"] }
+prost = { workspace = true, features = ["prost-derive"] }
 rand = { workspace = true }
-serde = "1.0.160"
-serde_json = "1.0.96"
-smart-default = "0.7.1"
+serde = { workspace = true }
 thiserror = { workspace = true }
 tls_codec = { workspace = true }
 tokio = { workspace = true }
-toml = "0.7.4"
+chrono = "0.4.31"
+libsqlite3-sys = { version = "0.26.0", optional = true }
+serde_json = "1.0.96"
+smart-default = "0.7.1"
+toml = "0.8.4"
 tracing = "0.1.37"
 xmtp_cryptography = { path = "../xmtp_cryptography" }
 xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }