diff --git a/test-support/reference-trie/Cargo.toml b/test-support/reference-trie/Cargo.toml index 76107199..43589393 100644 --- a/test-support/reference-trie/Cargo.toml +++ b/test-support/reference-trie/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "reference-trie" -version = "0.12.3" +version = "0.13.0" authors = ["Parity Technologies "] 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"} @@ -12,11 +13,10 @@ 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]] diff --git a/test-support/reference-trie/src/lib.rs b/test-support/reference-trie/src/lib.rs index 1d7edbd8..ece82b0c 100644 --- a/test-support/reference-trie/src/lib.rs +++ b/test-support/reference-trie/src/lib.rs @@ -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; diff --git a/test-support/trie-bench/Cargo.toml b/test-support/trie-bench/Cargo.toml index df12f5f5..68003bd8 100644 --- a/test-support/trie-bench/Cargo.toml +++ b/test-support/trie-bench/Cargo.toml @@ -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 "] license = "Apache-2.0" +edition = "2018" [dependencies] keccak-hasher = { path = "../keccak-hasher", version = "0.12.3" } @@ -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" diff --git a/test-support/trie-bench/src/lib.rs b/test-support/trie-bench/src/lib.rs index f21d4379..dae56e13 100644 --- a/test-support/trie-bench/src/lib.rs +++ b/test-support/trie-bench/src/lib.rs @@ -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; diff --git a/trie-db/Cargo.toml b/trie-db/Cargo.toml index 1f2cdf89..009b18ac 100644 --- a/trie-db/Cargo.toml +++ b/trie-db/Cargo.toml @@ -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" diff --git a/trie-root/Cargo.toml b/trie-root/Cargo.toml index 8c5a3411..ecd4b639 100644 --- a/trie-root/Cargo.toml +++ b/trie-root/Cargo.toml @@ -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"]