Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Remove mem_info and references to parity-util-mem #12795

Merged
paritytech-processbot merged 13 commits into from
Dec 6, 2022
Merged

Remove mem_info and references to parity-util-mem #12795

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b93c60e
Remove mem_info and some references to parity-util-mem
mrcnski Nov 25, 2022
95a867e
[Draft] Finish removing references to `parity-util-mem`
mrcnski Nov 28, 2022
3a9bf4a
Upgrade dependencies
mrcnski Nov 29, 2022
ba63081
Update scripts/ci/deny.toml
mrcnski Nov 29, 2022
426beb6
Fix Cargo.lock (remove unwanted dependency changes)
mrcnski Nov 29, 2022
907614a
Removed unused argument
mrcnski Nov 29, 2022
a1e9f35
Merge remote-tracking branch 'origin/m-cat/remove-parity-util-mem' in…
mrcnski Nov 29, 2022
2c09bca
Run cargo fmt (didn't have pre-commit set up)
mrcnski Nov 30, 2022
5e086dc
Merge branch 'master' into m-cat/remove-parity-util-mem
mrcnski Nov 30, 2022
4f5fe52
Fix some CI errors
mrcnski Nov 30, 2022
6ce120f
Fix another CI error
mrcnski Nov 30, 2022
7be1f35
Remove unused dependency
mrcnski Nov 30, 2022
ae6ff17
Merge branch 'master' into m-cat/remove-parity-util-mem
mrcnski Dec 5, 2022
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
Prev Previous commit
Next Next commit
Upgrade dependencies
  • Loading branch information
@mrcnski
mrcnski committed Nov 29, 2022
commit 3a9bf4ac37a69cd5e5145bd3e97abd9c62a54bec
575 changes: 272 additions & 303 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bin/node/bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ sp-state-machine = { version = "0.13.0", path = "../../../primitives/state-machi
serde = "1.0.136"
serde_json = "1.0.85"
derive_more = { version = "0.99.17", default-features = false, features = ["display"] }
kvdb = { version = "0.12.0", path = "../../../../parity-common/kvdb" }
kvdb-rocksdb = { version = "0.16.0", path = "../../../../parity-common/kvdb-rocksdb" }
kvdb = "0.13.0"
kvdb-rocksdb = "0.17.0"
sp-trie = { version = "7.0.0", path = "../../../primitives/trie" }
sp-core = { version = "7.0.0", path = "../../../primitives/core" }
sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
Expand Down
4 changes: 1 addition & 3 deletions bin/node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../ut
serde_json = "1.0.85"

[target.'cfg(any(target_arch="x86_64", target_arch="aarch64"))'.dependencies]
sp-trie = { version = "7.0.0", default-features = false, path = "../../../primitives/trie", features = [
"memory-tracker",
] }
sp-trie = { version = "7.0.0", default-features = false, path = "../../../primitives/trie" }

[dev-dependencies]
sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
Expand Down
8 changes: 4 additions & 4 deletions client/db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = [
"derive",
] }
hash-db = "0.15.2"
kvdb = "0.12.0"
kvdb-memorydb = "0.12.0"
kvdb-rocksdb = { version = "0.16.0", optional = true }
kvdb = "0.13.0"
kvdb-memorydb = "0.13.0"
kvdb-rocksdb = { version = "0.17.0", optional = true }
linked-hash-map = "0.5.4"
log = "0.4.17"
parity-db = "0.4.2"
Expand All @@ -36,7 +36,7 @@ sp-trie = { version = "7.0.0", path = "../../primitives/trie" }

[dev-dependencies]
criterion = "0.3.3"
kvdb-rocksdb = "0.16.0"
kvdb-rocksdb = "0.17.0"
rand = "0.8.4"
tempfile = "3.1.0"
quickcheck = { version = "1.0.3", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion primitives/database/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ documentation = "https://docs.rs/sp-database"
readme = "README.md"

[dependencies]
kvdb = "0.12.0"
kvdb = "0.13.0"
parking_lot = "0.12.1"
5 changes: 2 additions & 3 deletions primitives/trie/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ hashbrown = { version = "0.12.3", optional = true }
hash-db = { version = "0.15.2", default-features = false }
lazy_static = { version = "1.4.0", optional = true }
lru = { version = "0.8.1", optional = true }
memory-db = { version = "0.30.0", default-features = false }
memory-db = { version = "0.31.0", default-features = false }
nohash-hasher = { version = "0.2.0", optional = true }
parking_lot = { version = "0.12.1", optional = true }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
Expand All @@ -38,7 +38,7 @@ sp-std = { version = "5.0.0", default-features = false, path = "../std" }
[dev-dependencies]
array-bytes = "4.1"
criterion = "0.3.3"
trie-bench = "0.32.0"
trie-bench = "0.33.0"
trie-standardmap = "0.15.2"
sp-runtime = { version = "7.0.0", path = "../runtime" }

Expand All @@ -62,4 +62,3 @@ std = [
"trie-db/std",
"trie-root/std",
]
memory-tracker = []
13 changes: 4 additions & 9 deletions primitives/trie/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,11 +146,6 @@ where
}
}

#[cfg(not(feature = "memory-tracker"))]
type MemTracker = memory_db::NoopTracker<trie_db::DBValue>;
#[cfg(feature = "memory-tracker")]
type MemTracker = memory_db::MemCounter<trie_db::DBValue>;

/// TrieDB error over `TrieConfiguration` trait.
pub type TrieError<L> = trie_db::TrieError<TrieHash<L>, CError<L>>;
/// Reexport from `hash_db`, with genericity set for `Hasher` trait.
Expand All @@ -162,13 +157,13 @@ pub type HashDB<'a, H> = dyn hash_db::HashDB<H, trie_db::DBValue> + 'a;
/// This uses a `KeyFunction` for prefixing keys internally (avoiding
/// key conflict for non random keys).
pub type PrefixedMemoryDB<H> =
memory_db::MemoryDB<H, memory_db::PrefixedKey<H>, trie_db::DBValue, MemTracker>;
memory_db::MemoryDB<H, memory_db::PrefixedKey<H>, trie_db::DBValue>;
/// Reexport from `hash_db`, with genericity set for `Hasher` trait.
/// This uses a noops `KeyFunction` (key addressing must be hashed or using
/// an encoding scheme that avoid key conflict).
pub type MemoryDB<H> = memory_db::MemoryDB<H, memory_db::HashKey<H>, trie_db::DBValue, MemTracker>;
pub type MemoryDB<H> = memory_db::MemoryDB<H, memory_db::HashKey<H>, trie_db::DBValue>;
/// Reexport from `hash_db`, with genericity set for `Hasher` trait.
pub type GenericMemoryDB<H, KF> = memory_db::MemoryDB<H, KF, trie_db::DBValue, MemTracker>;
pub type GenericMemoryDB<H, KF> = memory_db::MemoryDB<H, KF, trie_db::DBValue>;

/// Persistent trie database read-access interface for the a given hasher.
pub type TrieDB<'a, 'cache, L> = trie_db::TrieDB<'a, 'cache, L>;
Expand Down Expand Up @@ -549,7 +544,7 @@ mod tests {
type LayoutV1 = super::LayoutV1<Blake2Hasher>;

type MemoryDBMeta<H> =
memory_db::MemoryDB<H, memory_db::HashKey<H>, trie_db::DBValue, MemTracker>;
memory_db::MemoryDB<H, memory_db::HashKey<H>, trie_db::DBValue>;

fn hashed_null_node<T: TrieConfiguration>() -> TrieHash<T> {
<T::Codec as NodeCodecT>::hashed_null_node()
Expand Down
2 changes: 1 addition & 1 deletion test-utils/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
sp-inherents = { version = "4.0.0-dev", default-features = false, path = "../../primitives/inherents" }
sp-keyring = { version = "7.0.0", optional = true, path = "../../primitives/keyring" }
memory-db = { version = "0.30.0", default-features = false }
memory-db = { version = "0.31.0", default-features = false }
sp-offchain = { version = "4.0.0-dev", default-features = false, path = "../../primitives/offchain" }
sp-core = { version = "7.0.0", default-features = false, path = "../../primitives/core" }
sp-std = { version = "5.0.0", default-features = false, path = "../../primitives/std" }
Expand Down
4 changes: 2 additions & 2 deletions utils/frame/benchmarking-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ handlebars = "4.2.2"
hash-db = "0.15.2"
Inflector = "0.11.4"
itertools = "0.10.3"
kvdb = "0.12.0"
kvdb = "0.13.0"
lazy_static = "1.4.0"
linked-hash-map = "0.5.4"
log = "0.4.17"
memory-db = "0.30.0"
memory-db = "0.31.0"
rand = { version = "0.8.4", features = ["small_rng"] }
rand_pcg = "0.3.1"
serde = "1.0.136"
Expand Down