Skip to content

Update codec version #19

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

Merged
dvdplm merged 1 commit into from
Jun 14, 2019
Merged

Update codec version #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions test-support/reference-trie/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[package]
name = "reference-trie"
version = "0.12.3"
version = "0.13.0"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Simple reference trie format"
repository = "https://github.com/paritytech/trie/"
license = "Apache-2.0"
edition = "2018"

[dependencies]
hash-db = { path = "../../hash-db" , version = "0.12.3"}
hash256-std-hasher = { path = "../../hash256-std-hasher", version = "0.12.3" }
keccak-hasher = { path = "../keccak-hasher", version = "0.12.3" }
trie-db = { path = "../../trie-db", default-features = false, version = "0.12.3"}
trie-root = { path = "../../trie-root", default-features = false, version = "0.12.3" }
parity-codec = "3.0"
parity-codec-derive = "3.0"
parity-codec = { version = "4.0", features = ["derive"] }

[dev-dependencies]
trie-bench = { path = "../trie-bench", version = "0.12.3" }
trie-bench = { path = "../trie-bench", version = "0.13.0" }
criterion = "0.2.8"

[[bench]]
Expand Down
8 changes: 1 addition & 7 deletions test-support/reference-trie/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,10 @@

//! Reference implementation of a streamer.

extern crate hash_db;
extern crate trie_db;
extern crate parity_codec as codec;
extern crate trie_root;
extern crate keccak_hasher;

use std::fmt;
use std::error::Error as StdError;
use std::iter::once;
use codec::{Decode, Input, Output, Encode, Compact};
use parity_codec::{Decode, Input, Output, Encode, Compact};
use trie_root::Hasher;
use trie_db::{node::Node, triedbmut::ChildReference, DBValue};
use keccak_hasher::KeccakHasher;
Expand Down
5 changes: 3 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,9 +1,10 @@
[package]
name = "trie-bench"
description = "Standard benchmarking suite for tries"
version = "0.12.3"
version = "0.13.0"
authors = ["Parity Technologies <admin@parity.io>"]
license = "Apache-2.0"
edition = "2018"

[dependencies]
keccak-hasher = { path = "../keccak-hasher", version = "0.12.3" }
Expand All @@ -13,4 +14,4 @@ memory-db = { path = "../../memory-db", version = "0.12.3" }
trie-root = { path = "../../trie-root", version = "0.12.3" }
trie-db = { path = "../../trie-db", version = "0.12.3" }
criterion = "0.2.8"
parity-codec = "3.0"
parity-codec = "4.0"
9 changes: 0 additions & 9 deletions test-support/trie-bench/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@

//! Standard trie benchmarking tool.

extern crate criterion;
extern crate keccak_hasher;
extern crate hash_db;
extern crate memory_db;
extern crate trie_db;
extern crate trie_root;
extern crate trie_standardmap;
extern crate parity_codec;

use parity_codec::{Encode, Compact};
use criterion::{Criterion, black_box, Fun};
use keccak_hasher::KeccakHasher;
Expand Down
2 changes: 1 addition & 1 deletion trie-db/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ trie-root = { path = "../trie-root", version = "0.12.3"}
trie-standardmap = { path = "../test-support/trie-standardmap", version = "0.12.3" }
keccak-hasher = { path = "../test-support/keccak-hasher", version = "0.12.3" }
# DISABLE the following line when publishing until cyclic dependencies are resolved https://github.com/rust-lang/cargo/issues/4242
reference-trie = { path = "../test-support/reference-trie", version = "0.12.3" }
reference-trie = { path = "../test-support/reference-trie", version = "0.13.0" }
hex-literal = "0.1"
criterion = "0.2.8"

Expand Down
2 changes: 1 addition & 1 deletion trie-root/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ hex-literal = "0.1"
keccak-hasher = { path = "../test-support/keccak-hasher", version = "0.12.3" }
trie-standardmap = { path = "../test-support/trie-standardmap", version = "0.12.3" }
# DISABLE the following line when publishing until cyclic dependencies are resolved https://github.com/rust-lang/cargo/issues/4242
reference-trie = { path = "../test-support/reference-trie", version = "0.12.3" }
reference-trie = { path = "../test-support/reference-trie", version = "0.13.0" }

[features]
default = ["std"]
Expand Down