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

Restart streams if service unavailable detected #1163

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
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
44 changes: 44 additions & 0 deletions .github/workflows/test-workspace-against-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Test Workspace
on:
push:
branches:
- main
pull_request:
# only run tests when related changes are made
paths:
- ".github/workflows/test-workspace-against-dev.yml"
- "dev/**"
- "mls_validation_service/**"
- "xmtp_api_grpc/**"
- "xmtp_cryptography/**"
- "xmtp_id/**"
- "xmtp_mls/**"
- "xmtp_proto/**"
- "xmtp_v2/**"
- "Cargo.toml"
- "Cargo.lock"
- "rust-toolchain"
env:
CARGO_TERM_COLOR: always
jobs:
test:
name: Test
runs-on: warp-ubuntu-latest-x64-16x
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Update rust toolchains
run: rustup update
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
- name: Cache
uses: Swatinem/rust-cache@v2
with:
workspaces: |
.
- name: Install nextest
uses: taiki-e/install-action@nextest
- name: build tests
run: cargo nextest run --features test-dev --no-run --workspace --tests --exclude xmtpv3 --exclude bindings_node --exclude bindings_wasm
- name: cargo test
run: cargo nextest run --features test-dev --workspace --test-threads 2 --exclude xmtpv3 --exclude bindings_node --exclude bindings_wasm
58 changes: 21 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ members = [
resolver = "2"

[workspace.package]
version = "0.0.1"
version = "0.1.0"

[workspace.dependencies]
anyhow = "1.0"
Expand Down Expand Up @@ -72,8 +72,8 @@ web-sys = "0.3"
js-sys = "0.3"
# NOTE: A regression in openssl-sys exists where libatomic is dynamically linked
# for i686-linux-android targets. https://github.com/sfackler/rust-openssl/issues/2163
openssl-sys = "0.9.104"
openssl = "0.10.68"
openssl-sys = "=0.9.92"
openssl = "=0.10.57"
libsqlite3-sys = { version = "0.29", features = ["bundled-sqlcipher-vendored-openssl" ] }
dyn-clone = "1"
trait-variant = "0.1.2"
Expand Down Expand Up @@ -120,9 +120,7 @@ inherits = "release-with-lto"
# optimize for binary size
opt-level = "s"

# patch needed until some items
# are made public for third-party dependencies: https://github.com/diesel-rs/diesel/pull/4236
# (cfg-specific patche support does not exist)
# patch needed until diesel makes a release past `2.2.4`
[patch.crates-io]
diesel-wasm-sqlite = { git = "https://github.com/xmtp/diesel-wasm-sqlite", branch = "main" }
diesel = { git = "https://github.com/diesel-rs/diesel", branch = "master" }
Expand Down
2 changes: 1 addition & 1 deletion bindings_ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ name = "ffi-uniffi-bindgen"
path = "src/bin.rs"

[dev-dependencies]
ethers = { workspace = true, features = ["openssl"] }
ethers.workspace = true
rand.workspace = true
tokio = { workspace = true, features = ["rt-multi-thread"] }
uniffi = { version = "0.28.0", features = ["bindgen-tests"] }
Expand Down
2 changes: 2 additions & 0 deletions xmtp_api_grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ name = "xmtp_api_grpc"
version.workspace = true

[dependencies]
thiserror.workspace = true
async-stream.workspace = true
base64.workspace = true
futures.workspace = true
Expand All @@ -14,6 +15,7 @@ tonic = { workspace = true, features = [
"tls-native-roots",
"tls-webpki-roots",
] }
http = "1.1" # for error msgs from tonic
tracing.workspace = true
xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
xmtp_v2 = { path = "../xmtp_v2" }
Expand Down
Loading