Skip to content

Commit

Permalink
Revert "rocksdb 0.22 via a patch"
Browse files Browse the repository at this point in the history
This reverts commit c05c511.

rocksdb 0.22 does not work on Windows at this time.
  • Loading branch information
kayabaNerve committed Feb 18, 2024
1 parent d88aa90 commit c41a8ac
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 45 deletions.
37 changes: 18 additions & 19 deletions Cargo.lock

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

3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ resolver = "2"
members = [
# Version patches
"patches/zstd",
"patches/rocksdb",
"patches/proc-macro-crate",

# std patches
Expand Down Expand Up @@ -113,8 +112,6 @@ dockertest = { git = "https://github.com/kayabaNerve/dockertest-rs", branch = "a

# wasmtime pulls in an old version for this
zstd = { path = "patches/zstd" }
# substrate pulls in an old version for this
rocksdb = { path = "patches/rocksdb" }
# proc-macro-crate 2 binds to an old version of toml for msrv so we patch to 3
proc-macro-crate = { path = "patches/proc-macro-crate" }

Expand Down
2 changes: 1 addition & 1 deletion common/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ workspace = true

[dependencies]
parity-db = { version = "0.4", default-features = false, optional = true }
rocksdb = { version = "0.22", default-features = false, features = ["lz4"], optional = true }
rocksdb = { version = "0.21", default-features = false, features = ["lz4"], optional = true }

[features]
parity-db = ["dep:parity-db"]
Expand Down
21 changes: 0 additions & 21 deletions patches/rocksdb/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion patches/rocksdb/src/lib.rs

This file was deleted.

0 comments on commit c41a8ac

Please sign in to comment.