From 846e6ea2d43dd5f40d447501138be21eb132d2e5 Mon Sep 17 00:00:00 2001
From: cheme <emericchevalier.pro@gmail.com>
Date: Wed, 9 Nov 2022 09:23:44 +0100
Subject: [PATCH] update paritydb and remove dev deps on rocksdb (#12641)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* update paritydb and remove dev deps on rocksdb
* feature rocksdb for node testing
* feature decl in node-bench
* revert change to rocksdb inclusion logic
* Update bin/node/bench/Cargo.toml
Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: parity-processbot <>
Co-authored-by: Bastian Köcher <git@kchr.de>
---
Cargo.lock | 45 +++++++++++----------------------------
Cargo.toml | 1 -
bin/node/bench/Cargo.toml | 2 +-
client/db/Cargo.toml | 2 +-
4 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 48205d9bd86da..bec6b0bd976e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -601,16 +601,6 @@ dependencies = [
"digest 0.10.3",
]
-[[package]]
-name = "blake2-rfc"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
-dependencies = [
- "arrayvec 0.4.12",
- "constant_time_eq",
-]
-
[[package]]
name = "blake2b_simd"
version = "1.0.0"
@@ -1797,7 +1787,7 @@ checksum = "64fba5a42bd76a17cad4bfa00de168ee1cbfa06a5e8ce992ae880218c05641a9"
dependencies = [
"byteorder",
"dynasm",
- "memmap2 0.5.0",
+ "memmap2",
]
[[package]]
@@ -4097,9 +4087,9 @@ dependencies = [
[[package]]
name = "lz4"
-version = "1.23.2"
+version = "1.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c"
+checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
dependencies = [
"libc",
"lz4-sys",
@@ -4107,9 +4097,9 @@ dependencies = [
[[package]]
name = "lz4-sys"
-version = "1.9.2"
+version = "1.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
dependencies = [
"cc",
"libc",
@@ -4185,15 +4175,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "memmap2"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e3e85b970d650e2ae6d70592474087051c11c54da7f7b4949725c5735fbcc6"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "memmap2"
version = "0.5.0"
@@ -6451,19 +6432,19 @@ dependencies = [
[[package]]
name = "parity-db"
-version = "0.3.16"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb474d0ed0836e185cb998a6b140ed1073d1fbf27d690ecf9ede8030289382c"
+checksum = "3a7511a0bec4a336b5929999d02b560d2439c993cccf98c26481484e811adc43"
dependencies = [
- "blake2-rfc",
+ "blake2",
"crc32fast",
"fs2",
"hex",
"libc",
"log",
"lz4",
- "memmap2 0.2.1",
- "parking_lot 0.11.2",
+ "memmap2",
+ "parking_lot 0.12.1",
"rand 0.8.5",
"snap",
]
@@ -7694,7 +7675,7 @@ name = "sc-chain-spec"
version = "4.0.0-dev"
dependencies = [
"impl-trait-for-tuples",
- "memmap2 0.5.0",
+ "memmap2",
"parity-scale-codec",
"sc-chain-spec-derive",
"sc-network-common",
@@ -11167,7 +11148,7 @@ version = "1.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
"digest 0.10.3",
"rand 0.8.5",
"static_assertions",
@@ -11615,7 +11596,7 @@ dependencies = [
"enumset",
"lazy_static",
"loupe",
- "memmap2 0.5.0",
+ "memmap2",
"more-asserts",
"rustc-demangle",
"serde",
diff --git a/Cargo.toml b/Cargo.toml
index d3c801fc2c7be..45aa5f9854d25 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -254,7 +254,6 @@ members = [
# This list is ordered alphabetically.
[profile.dev.package]
blake2 = { opt-level = 3 }
-blake2-rfc = { opt-level = 3 }
blake2b_simd = { opt-level = 3 }
chacha20poly1305 = { opt-level = 3 }
cranelift-codegen = { opt-level = 3 }
diff --git a/bin/node/bench/Cargo.toml b/bin/node/bench/Cargo.toml
index 54a1d4900c60b..5fb4c418e8ae8 100644
--- a/bin/node/bench/Cargo.toml
+++ b/bin/node/bench/Cargo.toml
@@ -38,7 +38,7 @@ fs_extra = "1"
rand = { version = "0.7.2", features = ["small_rng"] }
lazy_static = "1.4.0"
parity-util-mem = { version = "0.12.0", default-features = false, features = ["primitive-types"] }
-parity-db = { version = "0.3" }
+parity-db = "0.4.2"
sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
futures = { version = "0.3.21", features = ["thread-pool"] }
diff --git a/client/db/Cargo.toml b/client/db/Cargo.toml
index b21038b77564f..c12bf933f6bb1 100644
--- a/client/db/Cargo.toml
+++ b/client/db/Cargo.toml
@@ -22,7 +22,7 @@ kvdb-memorydb = "0.12.0"
kvdb-rocksdb = { version = "0.16.0", optional = true }
linked-hash-map = "0.5.4"
log = "0.4.17"
-parity-db = "0.3.16"
+parity-db = "0.4.2"
parking_lot = "0.12.1"
sc-client-api = { version = "4.0.0-dev", path = "../api" }
sc-state-db = { version = "0.10.0-dev", path = "../state-db" }