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.

Sign up for GitHub

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

Update the rusqlite and arti-client crates #1578

Merged
merged 3 commits into from
Oct 17, 2024
Merged

Update the rusqlite and arti-client crates #1578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c5e198
zcash_client_sqlite: Migrate to `schemerz 0.2`
str4d Oct 16, 2024
7367313
Migrate to `rusqlite 0.30`
str4d Oct 16, 2024
8ff0b1a
Migrate to `rusqlite 0.31`
str4d Oct 16, 2024
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
1,023 changes: 572 additions & 451 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ subtle = "2.2.3"
# - Warning: One of the downstream consumers requires that SQLite be available through
# CocoaPods, due to being bound to React Native. We need to ensure that the SQLite
# version required for `rusqlite` is a version that is available through CocoaPods.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked and I believe our constraints here are met for all rusqlite versions existing in this PR:

rusqlite Bundled SQLite Matching CocoaPods sqlite3 tag
0.29 3.41.2 ✅
0.30 3.44.0 ✅
0.31 3.45.1 ✅
0.32 3.46.0 ✅

rusqlite = { version = "0.29.0", features = ["bundled"] }
schemerz = "0.1"
schemerz-rusqlite = "0.290"
rusqlite = { version = "0.31", features = ["bundled"] }
schemerz = "0.2"
schemerz-rusqlite = "0.310"
time = "0.3.22"
uuid = "1.1"

Expand All @@ -145,9 +145,9 @@ incrementalmerkletree-testing = "0.2"
# Tor
# - `arti-client` depends on `rusqlite`, and a version mismatch there causes a compilation
# failure due to incompatible `libsqlite3-sys` versions.
arti-client = { version = "0.11", default-features = false, features = ["compression", "rustls", "tokio"] }
arti-client = { version = "0.22", default-features = false, features = ["compression", "rustls", "tokio"] }
tokio = "1"
tor-rtcompat = "0.9"
tor-rtcompat = "0.22"
tower = "0.4"

# ZIP 32
Expand Down
3 changes: 3 additions & 0 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@ exceptions = [
{ name = "coarsetime", allow = ["ISC"] },
{ name = "curve25519-dalek", allow = ["BSD-3-Clause"] },
{ name = "ed25519-dalek", allow = ["BSD-3-Clause"] },
{ name = "inotify", allow = ["ISC"] },
{ name = "inotify-sys", allow = ["ISC"] },
{ name = "matchit", allow = ["BSD-3-Clause"] },
{ name = "minreq", allow = ["ISC"] },
{ name = "notify", allow = ["CC0-1.0"] },
{ name = "option-ext", allow = ["MPL-2.0"] },
{ name = "priority-queue", allow = ["MPL-2.0"] },
{ name = "ring", allow = ["LicenseRef-ring"] },
Expand Down
Loading
Loading