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

Jump to bottom

bump dependencies and prepare for releases #118

Merged
merged 5 commits into from
Jan 5, 2021
Merged

bump dependencies and prepare for releases #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58b7c65
prepare for releases
ordian Jan 5, 2021
1451e34
bump trie-bench
ordian Jan 5, 2021
e0cccd6
Merge branch 'master' into ao-update-deps
ordian Jan 5, 2021
4ef3104
fix reference-trie
ordian Jan 5, 2021
8b9144e
Merge branch 'master' into ao-update-deps
ordian Jan 5, 2021
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
3 changes: 3 additions & 0 deletions memory-db/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog].

## [Unreleased]

## [0.25.0] - 2021-01-05
- Update `parity-util-mem` and `hashbrown`, removed `heapsize`. [#118](https://github.com/paritytech/trie/pull/118)

## [0.24.1] - 2020-07-20
- Add `shrink_to_fit` method. [#102](https://github.com/paritytech/trie/pull/102)

Expand Down
8 changes: 3 additions & 5 deletions memory-db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
[package]
name = "memory-db"
version = "0.24.1"
version = "0.25.0"
authors = ["Parity Technologies <admin@parity.io>"]
description = "In-memory implementation of hash-db, useful for tests"
repository = "https://github.com/paritytech/trie"
license = "Apache-2.0"
edition = "2018"

[dependencies]
heapsize = { version = "0.4", optional = true }
parity-util-mem = { version = "0.7.0", default-features = false, features = ["hashbrown"] }
parity-util-mem = { version = "0.8.0", default-features = false, features = ["hashbrown"] }
hash-db = { path = "../hash-db", default-features = false, version = "0.15.2"}
hashbrown = { version = "0.8.0", default-features = false, features = [ "ahash" ] }
hashbrown = { version = "0.9.1", default-features = false, features = [ "ahash" ] }

[dev-dependencies]
keccak-hasher = { path = "../test-support/keccak-hasher", version = "0.15.2"}
Expand All @@ -23,7 +22,6 @@ std = [
"hash-db/std",
"parity-util-mem/std",
]
deprecated = [ "heapsize" ]

[[bench]]
name = "bench"
Expand Down
19 changes: 0 additions & 19 deletions memory-db/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ pub use malloc_size_of::*;
use hash_db::{HashDB, HashDBRef, PlainDB, PlainDBRef, Hasher as KeyHasher,
AsHashDB, AsPlainDB, Prefix};
use parity_util_mem::{MallocSizeOf, MallocSizeOfOps, MallocShallowSizeOf};
#[cfg(feature = "deprecated")]
#[cfg(feature = "std")]
use heapsize::HeapSizeOf;
#[cfg(feature = "std")]
use std::{
collections::hash_map::Entry,
Expand Down Expand Up @@ -460,22 +457,6 @@ where
}
}

#[cfg(feature = "deprecated")]
#[cfg(feature = "std")]
impl<H, KF, T> MemoryDB<H, KF, T>
where
H: KeyHasher,
T: HeapSizeOf,
KF: KeyFunction<H>,
{
#[deprecated(since="0.12.0", note="please use `size_of` instead")]
/// Returns the size of allocated heap memory
pub fn mem_used(&self) -> usize {
0//self.data.heap_size_of_children()
// TODO Reenable above when HeapSizeOf supports arrays.
}
}

impl<H, KF, T, M> MallocSizeOf for MemoryDB<H, KF, T, M>
where
H: KeyHasher,
Expand Down
2 changes: 1 addition & 1 deletion test-support/reference-trie/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ trie-root = { path = "../../trie-root", default-features = false, version = "0.1
parity-scale-codec = { version = "1.0.3", features = ["derive"] }

[dev-dependencies]
trie-bench = { path = "../trie-bench", version = "0.25.0" }
trie-bench = { path = "../trie-bench", version = "0.26.0" }
criterion = "0.3.3"

[[bench]]
Expand Down
3 changes: 3 additions & 0 deletions test-support/trie-bench/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog].

## [Unreleased]

## [0.26.0] - 2021-01-05
- Update memory-db to 0.25. [#118](https://github.com/paritytech/trie/pull/118)

## [0.25.0] - 2020-07-24
- Update criterion to 0.3. [#106](https://github.com/paritytech/trie/pull/106)

Expand Down
4 changes: 2 additions & 2 deletions test-support/trie-bench/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "trie-bench"
description = "Standard benchmarking suite for tries"
version = "0.25.0"
version = "0.26.0"
authors = ["Parity Technologies <admin@parity.io>"]
repository = "https://github.com/paritytech/trie/"
license = "Apache-2.0"
Expand All @@ -11,7 +11,7 @@ edition = "2018"
keccak-hasher = { path = "../keccak-hasher", version = "0.15.2" }
trie-standardmap = { path = "../trie-standardmap", version = "0.15.2" }
hash-db = { path = "../../hash-db" , version = "0.15.2"}
memory-db = { path = "../../memory-db", version = "0.24.0" }
memory-db = { path = "../../memory-db", version = "0.25.0" }
trie-root = { path = "../../trie-root", version = "0.16.0" }
trie-db = { path = "../../trie-db", version = "0.22.0" }
criterion = "0.3.3"
Expand Down
3 changes: 3 additions & 0 deletions trie-db/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog].

## [Unreleased]

## [0.22.2] - 2021-01-05
- Update `hashbrown` to 0.9. [#118](https://github.com/paritytech/trie/pull/118)
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- Update `hashbrown` to 0.9. [#118](https://github.com/paritytech/trie/pull/118)
- Update `hashbrown` to 0.9. [#118](https://github.com/paritytech/trie/pull/118)
- Externalize test to internal test crate. [#111](https://github.com/paritytech/trie/pull/111)

Copy link
Member Author

Choose a reason for hiding this comment

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

This change is not observable for an external user.


## [0.22.1] - 2020-07-24
- Use `ahash` feature of hashbrown. [#103](https://github.com/paritytech/trie/pull/103)

Expand Down
4 changes: 2 additions & 2 deletions trie-db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "trie-db"
version = "0.22.1"
version = "0.22.2"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Merkle-Patricia Trie generic over key hasher and node encoding"
repository = "https://github.com/paritytech/trie"
Expand All @@ -11,7 +11,7 @@ edition = "2018"
log = "0.4"
smallvec = "1.0.0"
hash-db = { path = "../hash-db", default-features = false, version = "0.15.2"}
hashbrown = { version = "0.8.0", default-features = false, features = ["ahash"] }
hashbrown = { version = "0.9.1", default-features = false, features = ["ahash"] }
rustc-hex = { version = "2.1.0", default-features = false, optional = true }

[features]
Expand Down
2 changes: 1 addition & 1 deletion trie-db/test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ harness = false
trie-db = { path = "..", version = "0.22.1"}
hash-db = { path = "../../hash-db", version = "0.15.2"}
rustc-hex = { version = "2.1.0" }
memory-db = { path = "../../memory-db", version = "0.24.0" }
memory-db = { path = "../../memory-db", version = "0.25.0" }
rand = { version = "0.7", default-features = false, features = ["small_rng"] }
trie-root = { path = "../../trie-root", version = "0.16.0"}
trie-standardmap = { path = "../../test-support/trie-standardmap", version = "0.15.2" }
Expand Down