Merge branch 'main' into nmolnar/add-db-models

xmtp · Nov 1, 2023 · 78f274e · 78f274e
2 parents b1797ae + 9268266
commit 78f274e
Show file tree

Hide file tree

Showing 10 changed files with 721 additions and 58 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev/docker/up b/dev/docker/up
@@ -3,4 +3,4 @@ set -eou pipefail
 script_dir="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 "${script_dir}"/compose pull
-"${script_dir}"/compose up -d
+"${script_dir}"/compose up -d --build
diff --git a/xmtp_mls/Cargo.toml b/xmtp_mls/Cargo.toml
@@ -19,8 +19,8 @@ native = ["libsqlite3-sys/bundled-sqlcipher-vendored-openssl"]
 [dependencies]
 anyhow = "1.0.71"
 async-trait = "0.1.68"
-diesel = { version = "2.0.4", features = ["sqlite", "r2d2", "returning_clauses_for_sqlite_3_35"] }
-diesel_migrations = { version = "2.0.0", features = ["sqlite"] }
+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"
@@ -40,8 +40,10 @@ tokio = { version = "1.28.1", features = ["macros"]  }
 toml = "0.7.4"
 xmtp_cryptography = { path = "../xmtp_cryptography"}
 xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
+tls_codec = "0.3.0"
 
 [dev-dependencies]
+mockall = "0.11.4"
 rand = "0.8.5"
 tempfile = "3.5.0"
 xmtp_api_grpc = { path = "../xmtp_api_grpc" }