Skip to content

Commit

Permalink
Re-flatten crate structure and get rid of PushService trait
Browse files Browse the repository at this point in the history
This is a first step to refactor PushService and split the push_service.rs file in many smaller parts.
  • Loading branch information
gferon committed Oct 15, 2024
1 parent 65b51db commit dbf0fd8
Show file tree
Hide file tree
Showing 65 changed files with 686 additions and 2,384 deletions.
16 changes: 2 additions & 14 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
project: ["libsignal-service-actix", "libsignal-service-hyper", "libsignal-service"]
features: ["", "unsend-futures"]
exclude:
# -actix always has unsend futures, so we don't have that feature flag
- project: "libsignal-service-actix"
features: "unsend-futures"
project: ["libsignal-service"]
steps:
- uses: actions/checkout@v3
- name: Install protobuf
Expand All @@ -45,7 +40,7 @@ jobs:
strategy:
fail-fast: false
matrix:
project: ["libsignal-service-actix", "libsignal-service-hyper", "libsignal-service"]
project: ["libsignal-service"]
toolchain: ["stable", "beta", "nightly"]
coverage: [false, true]
features: ["", "unsend-futures"]
Expand All @@ -60,17 +55,10 @@ jobs:

# Feature flag related excludes
# Actix like above
- project: "libsignal-service-actix"
features: "unsend-futures"
# We don't need to spawn this many jobs to see that unsend-futures works
- features: "unsend-futures"
toolchain: "beta"
- features: "unsend-futures"
toolchain: "nightly"
include:
- project: "libsignal-service-actix"
toolchain: "1.75"
coverage: false
steps:
- uses: actions/checkout@v3
- name: Install protobuf
Expand Down
65 changes: 61 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,65 @@
[workspace]
members = ["libsignal-service", "libsignal-service-actix", "libsignal-service-hyper"]
default-members = ["libsignal-service", "libsignal-service-hyper"]
[package]
name = "libsignal-service"
version = "0.1.0"
authors = ["Ruben De Smet <[email protected]>", "Gabriel Féron <[email protected]>", "Michael Bryan <[email protected]>", "Shady Khalifa <[email protected]>"]
edition = "2021"
license = "AGPL-3.0"
readme = "../README.md"

resolver = "2"
[dependencies]
libsignal-protocol = { git = "https://github.com/signalapp/libsignal", tag = "v0.56.1" }
zkgroup = { git = "https://github.com/signalapp/libsignal", tag = "v0.56.1" }

aes = "0.8"
aes-gcm = "0.10"
cbc = "0.1"
ctr = "0.9"
async-trait = "0.1"
base64 = "0.22"
bincode = "1.3"
bytes = "1"
chrono = { version = "0.4", features = ["serde", "clock"], default-features = false }
derivative = "2.2"
futures = "0.3"
hex = "0.4"
hkdf = "0.12"
hmac = "0.12"
phonenumber = "0.3"
prost = "0.13"
rand = "0.8"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.85"
sha2 = "0.10"
thiserror = "1.0"
url = { version = "2.1", features = ["serde"] }
uuid = { version = "1", features = ["serde"] }

# http
hyper = "1.0"
hyper-util = { version = "0.1", features = ["client", "client-legacy"] }
hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "logging"] }
hyper-timeout = "0.5"
headers = "0.4"
http-body-util = "0.1"
mpart-async = "0.7"
async-tungstenite = { version = "0.27", features = ["tokio-rustls-native-certs", "url"] }
tokio = { version = "1.0", features = ["macros"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] }

rustls-pemfile = "2.0"

tracing = { version = "0.1", features = ["log"] }
tracing-futures = "0.2"

[build-dependencies]
prost-build = "0.13"

[dev-dependencies]
anyhow = "1.0"
tokio = { version = "1.0", features = ["macros", "rt"] }

[features]
unsend-futures = []

[patch.crates-io]
curve25519-dalek = { git = 'https://github.com/signalapp/curve25519-dalek', tag = 'signal-curve25519-4.1.3' }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
42 changes: 0 additions & 42 deletions libsignal-service-actix/Cargo.toml

This file was deleted.

222 changes: 0 additions & 222 deletions libsignal-service-actix/examples/registering.rs

This file was deleted.

9 changes: 0 additions & 9 deletions libsignal-service-actix/src/lib.rs

This file was deleted.

Loading

0 comments on commit dbf0fd8

Please sign in to comment.