Skip to content

Commit

Permalink
format all the toml
Browse files Browse the repository at this point in the history
  • Loading branch information
insipx committed Jan 31, 2025
1 parent 34cf8c6 commit ba3a713
Show file tree
Hide file tree
Showing 20 changed files with 246 additions and 174 deletions.
6 changes: 3 additions & 3 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
runner = 'wasm-bindgen-test-runner'

[alias]
xtask = "run --package xtask --"
b = "build"
c = "check"
t = "test"
r = "run"
xli = "run --bin xmtp_cli --"
t = "test"
xdbg = "run --release --bin xdbg --"
xli = "run --bin xmtp_cli --"
xtask = "run --package xtask --"

[build]
rustflags = ["--cfg", "tracing_unstable"]
2 changes: 1 addition & 1 deletion .cargo/nextest.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[profile.default]
retries = 3
default-filter = "not test(test_stream_all_messages_does_not_lose_messages)"
retries = 3
12 changes: 12 additions & 0 deletions .taplo.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
exclude = [".direnv/**"]

[formatting]
reorder_keys = false

[[rule]]
include = ["**/Cargo.toml"]
keys = ["dependencies"]

[rule.formatting]
reorder_keys = true

[schema]
path = "https://json.schemastore.org/cargo.json"
14 changes: 9 additions & 5 deletions bindings_ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,31 @@ crate-type = ["lib", "cdylib", "staticlib"]

[dependencies]
futures.workspace = true
tracing.workspace = true
tracing-subscriber = { workspace = true, features = ["registry", "env-filter", "fmt", "json"] }
parking_lot.workspace = true
prost.workspace = true
thiserror.workspace = true
tokio = { workspace = true, features = ["macros"] }
tracing.workspace = true
tracing-subscriber = { workspace = true, features = [
"registry",
"env-filter",
"fmt",
"json",
] }
uniffi = { version = "0.28.0", default-features = false, features = ["tokio"] }
xmtp_api_grpc = { path = "../xmtp_api_grpc" }
xmtp_common.workspace = true
xmtp_content_types = { path = "../xmtp_content_types" }
xmtp_cryptography = { path = "../xmtp_cryptography" }
xmtp_id = { path = "../xmtp_id" }
xmtp_mls = { path = "../xmtp_mls" }
xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
xmtp_user_preferences = { path = "../xmtp_user_preferences" }
xmtp_v2 = { path = "../xmtp_v2" }
xmtp_common.workspace = true

# Bench
criterion = { workspace = true, optional = true }
fdlimit = { version = "0.3", optional = true}
fdlimit = { version = "0.3", optional = true }


[target.'cfg(target_os = "android")'.dependencies]
Expand Down Expand Up @@ -62,4 +67,3 @@ bench = ["xmtp_mls/bench", "xmtp_common/bench", "dep:criterion", "dep:fdlimit"]
harness = false
name = "create_client"
required-features = ["bench"]

4 changes: 2 additions & 2 deletions bindings_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ napi = { version = "2.12.2", default-features = false, features = [
napi-derive = "2.12.2"
prost.workspace = true
tokio = { workspace = true, features = ["sync"] }
tracing.workspace = true
tracing-subscriber = { workspace = true, features = [
"env-filter",
"fmt",
"json",
"chrono",
] }
tracing.workspace = true
xmtp_api_grpc = { path = "../xmtp_api_grpc" }
xmtp_common.workspace = true
xmtp_cryptography = { path = "../xmtp_cryptography" }
xmtp_id = { path = "../xmtp_id" }
xmtp_mls = { path = "../xmtp_mls" }
xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
xmtp_common.workspace = true

[build-dependencies]
napi-build = "2.0.1"
Expand Down
8 changes: 4 additions & 4 deletions bindings_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ crate-type = ["cdylib", "rlib"]

[dependencies]
console_error_panic_hook.workspace = true
futures.workspace = true
hex.workspace = true
js-sys.workspace = true
prost.workspace = true
serde-wasm-bindgen = "0.6.5"
serde.workspace = true
serde-wasm-bindgen = "0.6.5"
tracing.workspace = true
tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }
tracing-web = "0.1"
tracing.workspace = true
wasm-bindgen-futures.workspace = true
wasm-bindgen.workspace = true
wasm-bindgen-futures.workspace = true
xmtp_api_http = { path = "../xmtp_api_http" }
xmtp_common.workspace = true
xmtp_cryptography = { path = "../xmtp_cryptography" }
xmtp_id = { path = "../xmtp_id" }
xmtp_mls = { path = "../xmtp_mls", features = ["test-utils", "http-api"] }
xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
futures.workspace = true

[dev-dependencies]
wasm-bindgen-test.workspace = true
Expand Down
42 changes: 31 additions & 11 deletions common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,28 @@ version.workspace = true
license.workspace = true

[dependencies]
web-time.workspace = true
tracing.workspace = true
tokio = { workspace = true, features = ["time"] }
rand = "0.8"
futures.workspace = true
rand = "0.8"
tokio = { workspace = true, features = ["time"] }
tracing.workspace = true
web-time.workspace = true
xmtp_cryptography.workspace = true

parking_lot = { workspace = true, optional = true }
tracing-subscriber = { workspace = true, features = ["fmt", "env-filter", "ansi", "json"], optional = true }
once_cell = { workspace = true, optional = true }
parking_lot = { workspace = true, optional = true }
tracing-flame = { version = "0.2", optional = true }
tracing-subscriber = { workspace = true, features = [
"fmt",
"env-filter",
"ansi",
"json",
], optional = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
getrandom = { workspace = true, features = ["js"] }
gloo-timers = { workspace = true, features = ["futures"] }
tracing-wasm = { version = "0.2", optional = true }
console_error_panic_hook = { version = "0.1", optional = true }
console_error_panic_hook = { version = "0.1", optional = true }
js-sys.workspace = true
web-sys = { workspace = true, features = ["Window"] }
wasm-bindgen-futures.workspace = true
Expand All @@ -31,12 +36,27 @@ wasm-bindgen.workspace = true
thiserror.workspace = true

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
tokio = { workspace = true, features = ["time", "macros", "rt", "sync"]}
tokio = { workspace = true, features = ["time", "macros", "rt", "sync"] }
wasm-bindgen-test.workspace = true

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { workspace = true, features = ["time", "macros", "rt-multi-thread", "sync"]}
tokio = { workspace = true, features = [
"time",
"macros",
"rt-multi-thread",
"sync",
] }

[features]
test-utils = ["dep:parking_lot", "dep:tracing-subscriber", "dep:tracing-wasm", "dep:console_error_panic_hook"]
bench = ["test-utils", "dep:tracing-subscriber", "dep:once_cell", "dep:tracing-flame"]
test-utils = [
"dep:parking_lot",
"dep:tracing-subscriber",
"dep:tracing-wasm",
"dep:console_error_panic_hook",
]
bench = [
"test-utils",
"dep:tracing-subscriber",
"dep:once_cell",
"dep:tracing-flame",
]
50 changes: 25 additions & 25 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[advisories]
ignore = [
{ id = "RUSTSEC-2024-0384", reason = "migration to alloy is underway which will resolve this advisory" },
{ id = "RUSTSEC-2024-0384", reason = "migration to alloy is underway which will resolve this advisory" },
]

# This rustsec can be added to ignore list if using mls `test_utils` for tests
Expand All @@ -10,34 +10,34 @@ ignore = [
# },
[licenses]
allow = [
"Apache-2.0",
"BSD-3-Clause",
"ISC",
"MIT",
"MPL-2.0",
"Unicode-DFS-2016",
"GPL-3.0",
"CC0-1.0",
"BSD-2-Clause",
"Unicode-3.0",
"Zlib",
"BSL-1.0"
"Apache-2.0",
"BSD-3-Clause",
"ISC",
"MIT",
"MPL-2.0",
"Unicode-DFS-2016",
"GPL-3.0",
"CC0-1.0",
"BSD-2-Clause",
"Unicode-3.0",
"Zlib",
"BSL-1.0",
]
confidence-threshold = 1.0

exceptions = [
{ allow = [
"OpenSSL",
], name = "ring", version = "*" },
{ allow = [
"Unlicense",
], name = "pharos", version = "0.5.3" },
{ allow = [
"Unlicense",
], name = "async_io_stream", version = "0.3.3" },
{ allow = [
"Unlicense",
], name = "ws_stream_wasm", version = "0.7.4" },
{ allow = [
"OpenSSL",
], name = "ring", version = "*" },
{ allow = [
"Unlicense",
], name = "pharos", version = "0.5.3" },
{ allow = [
"Unlicense",
], name = "async_io_stream", version = "0.3.3" },
{ allow = [
"Unlicense",
], name = "ws_stream_wasm", version = "0.7.4" },
]

[[licenses.clarify]]
Expand Down
14 changes: 7 additions & 7 deletions examples/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ timeago = "0.4.1"
tokio.workspace = true
tracing = { workspace = true, features = ["valuable"] }
tracing-subscriber = { workspace = true, features = [
"json",
"valuable",
"env-filter",
"ansi",
"chrono",
"json",
"valuable",
"env-filter",
"ansi",
"chrono",
] }
valuable = { version = "0.1", features = ["derive"] }
valuable-serde = "0.1"
xmtp_api_grpc = { path = "../../xmtp_api_grpc" }
xmtp_cryptography = { path = "../../xmtp_cryptography" }
xmtp_common.workspace = true
xmtp_content_types = { path = "../../xmtp_content_types" }
xmtp_cryptography = { path = "../../xmtp_cryptography" }
xmtp_id = { path = "../../xmtp_id" }
xmtp_mls = { path = "../../xmtp_mls" }
xmtp_proto = { path = "../../xmtp_proto", features = ["proto_full"] }
xmtp_common.workspace = true
6 changes: 3 additions & 3 deletions mls_validation_service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@ hex = { workspace = true }
openmls = { workspace = true }
openmls_rust_crypto = { workspace = true }
thiserror.workspace = true
tokio = { workspace = true, features = ["signal", "rt-multi-thread"] }
tonic = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter", "ansi"] }
tracing.workspace = true
tracing-subscriber = { workspace = true, features = ["env-filter", "ansi"] }
warp = "0.3.6"
xmtp_cryptography = { path = "../xmtp_cryptography" }
xmtp_id.workspace = true
xmtp_mls.workspace = true
xmtp_proto = { path = "../xmtp_proto", features = ["proto_full", "convert"] }
tokio = { workspace = true, features = ["signal", "rt-multi-thread"] }

[dev-dependencies]
anyhow.workspace = true
ethers.workspace = true
rand = { workspace = true }
xmtp_id = { workspace = true, features = ["test-utils"] }
xmtp_mls = { workspace = true, features = ["test-utils"] }
xmtp_common = { workspace = true, features = ["test-utils"]}
xmtp_common = { workspace = true, features = ["test-utils"] }

[features]
test-utils = ["xmtp_id/test-utils"]
8 changes: 2 additions & 6 deletions xmtp_api_grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,12 @@ tonic = { workspace = true, features = [
"default",
"tls",
"tls-native-roots",
"tls-webpki-roots"
"tls-webpki-roots",
] }

# Force Android + iOS to use webki
[target.'cfg(any(target_os = "android", target_os = "ios"))'.dependencies]
tonic = { workspace = true, features = [
"default",
"tls",
"tls-webpki-roots",
] }
tonic = { workspace = true, features = ["default", "tls", "tls-webpki-roots"] }

[dev-dependencies]
uuid = { workspace = true, features = ["v4"] }
Expand Down
10 changes: 5 additions & 5 deletions xmtp_api_http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ license.workspace = true
crate-type = ["cdylib", "rlib"]

[dependencies]
async-trait = "0.1"
bytes = "1.9"
futures = { workspace = true, default-features = false }
tracing.workspace = true
pin-project-lite = "0.2.15"
reqwest.workspace = true
serde = { workspace = true }
serde_json = { workspace = true }
thiserror.workspace = true
tracing.workspace = true
xmtp_proto = { path = "../xmtp_proto", features = ["proto_full"] }
async-trait = "0.1"
bytes = "1.9"
pin-project-lite = "0.2.15"
reqwest.workspace = true

xmtp_common.workspace = true

Expand Down
4 changes: 2 additions & 2 deletions xmtp_content_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ version.workspace = true
license.workspace = true

[dependencies]
thiserror = { workspace = true }
prost = { workspace = true, features = ["prost-derive"] }
rand = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true }
thiserror = { workspace = true }
tracing.workspace = true

# XMTP/Local
xmtp_proto = { workspace = true, features = ["convert"] }
xmtp_common = { workspace = true }
xmtp_proto = { workspace = true, features = ["convert"] }

[dev-dependencies]
xmtp_common = { workspace = true, features = ['test-utils'] }
Expand Down
Loading

0 comments on commit ba3a713

Please sign in to comment.