Migrate state-db, state-machine, telemetry, test-client and test-runtime to the 2018 edition (#1623)

substrate/core/state-machine/src/changes_trie/build.rs

@@ -17,15 +17,15 @@
 //! Structures and functions required to build changes trie for given block.
 
 use std::collections::{BTreeMap, BTreeSet};
-use codec::Decode;
+use parity_codec::Decode;
 use hash_db::Hasher;
 use heapsize::HeapSizeOf;
-use backend::Backend;
-use overlayed_changes::OverlayedChanges;
-use trie_backend_essence::{TrieBackendStorage, TrieBackendEssence};
-use changes_trie::build_iterator::digest_build_iterator;
-use changes_trie::input::{InputKey, InputPair, DigestIndex, ExtrinsicIndex};
-use changes_trie::{AnchorBlockId, Configuration, Storage};
+use crate::backend::Backend;
+use crate::overlayed_changes::OverlayedChanges;
+use crate::trie_backend_essence::{TrieBackendStorage, TrieBackendEssence};
+use crate::changes_trie::build_iterator::digest_build_iterator;
+use crate::changes_trie::input::{InputKey, InputPair, DigestIndex, ExtrinsicIndex};
+use crate::changes_trie::{AnchorBlockId, Configuration, Storage};
 
 /// Prepare input pairs for building a changes trie of given block.
 ///
@@ -142,12 +142,12 @@ fn prepare_digest_input<'a, S, H>(
 
 #[cfg(test)]
 mod test {
-	use codec::Encode;
+	use parity_codec::Encode;
 	use primitives::Blake2Hasher;
 	use primitives::storage::well_known_keys::EXTRINSIC_INDEX;
-	use backend::InMemory;
-	use changes_trie::storage::InMemoryStorage;
-	use overlayed_changes::OverlayedValue;
+	use crate::backend::InMemory;
+	use crate::changes_trie::storage::InMemoryStorage;
+	use crate::overlayed_changes::OverlayedValue;
 	use super::*;
 
 	fn prepare_for_build() -> (InMemory<Blake2Hasher>, InMemoryStorage<Blake2Hasher>, OverlayedChanges) {

substrate/core/state-machine/src/changes_trie/build_iterator.rs

@@ -17,7 +17,7 @@
 //! Structures and functions to return blocks whose changes are to be included
 //! in given block' changes trie.
 
-use changes_trie::Configuration;
+use crate::changes_trie::Configuration;
 
 /// Returns iterator of OTHER blocks that are required for inclusion into
 /// changes trie of given block.

substrate/core/state-machine/src/changes_trie/changes_iterator.rs

@@ -19,15 +19,15 @@
 
 use std::cell::RefCell;
 use std::collections::VecDeque;
-use codec::{Decode, Encode};
+use parity_codec::{Decode, Encode};
 use hash_db::{HashDB, Hasher};
 use heapsize::HeapSizeOf;
-use substrate_trie::{Recorder, MemoryDB};
-use changes_trie::{AnchorBlockId, Configuration, RootsStorage, Storage};
-use changes_trie::input::{DigestIndex, ExtrinsicIndex, DigestIndexValue, ExtrinsicIndexValue};
-use changes_trie::storage::{TrieBackendAdapter, InMemoryStorage};
-use proving_backend::ProvingBackendEssence;
-use trie_backend_essence::{TrieBackendEssence};
+use trie::{Recorder, MemoryDB};
+use crate::changes_trie::{AnchorBlockId, Configuration, RootsStorage, Storage};
+use crate::changes_trie::input::{DigestIndex, ExtrinsicIndex, DigestIndexValue, ExtrinsicIndexValue};
+use crate::changes_trie::storage::{TrieBackendAdapter, InMemoryStorage};
+use crate::proving_backend::ProvingBackendEssence;
+use crate::trie_backend_essence::{TrieBackendEssence};
 
 /// Return changes of given key at given blocks range.
 /// `max` is the number of best known block.
@@ -383,8 +383,8 @@ fn lower_bound_max_digest(
 mod tests {
 	use std::iter::FromIterator;
 	use primitives::Blake2Hasher;
-	use changes_trie::input::InputPair;
-	use changes_trie::storage::InMemoryStorage;
+	use crate::changes_trie::input::InputPair;
+	use crate::changes_trie::storage::InMemoryStorage;
 	use super::*;
 
 	fn prepare_for_drilldown() -> (Configuration, InMemoryStorage<Blake2Hasher>) {

substrate/core/state-machine/src/changes_trie/input.rs

@@ -16,7 +16,7 @@
 
 //! Different types of changes trie input pairs.
 
-use codec::{Decode, Encode, Input, Output};
+use parity_codec::{Decode, Encode, Input, Output};
 
 /// Key of { changed key => set of extrinsic indices } mapping.
 #[derive(Clone, Debug, PartialEq, Eq)]

substrate/core/state-machine/src/changes_trie/mod.rs

@@ -48,11 +48,11 @@ pub use self::prune::{prune, oldest_non_pruned_trie};
 
 use hash_db::Hasher;
 use heapsize::HeapSizeOf;
-use backend::Backend;
+use crate::backend::Backend;
 use primitives;
-use changes_trie::build::prepare_input;
-use overlayed_changes::OverlayedChanges;
-use trie_backend_essence::TrieBackendStorage;
+use crate::changes_trie::build::prepare_input;
+use crate::overlayed_changes::OverlayedChanges;
+use crate::trie_backend_essence::TrieBackendStorage;
 use trie::{DBValue, trie_root};
 
 /// Changes that are made outside of extrinsics are marked with this index;

substrate/core/state-machine/src/changes_trie/prune.rs

@@ -18,11 +18,12 @@
 
 use hash_db::Hasher;
 use heapsize::HeapSizeOf;
-use substrate_trie::Recorder;
-use proving_backend::ProvingBackendEssence;
-use trie_backend_essence::TrieBackendEssence;
-use changes_trie::{AnchorBlockId, Configuration, Storage};
-use changes_trie::storage::TrieBackendAdapter;
+use trie::Recorder;
+use log::warn;
+use crate::proving_backend::ProvingBackendEssence;
+use crate::trie_backend_essence::TrieBackendEssence;
+use crate::changes_trie::{AnchorBlockId, Configuration, Storage};
+use crate::changes_trie::storage::TrieBackendAdapter;
 
 /// Get number of oldest block for which changes trie is not pruned
 /// given changes trie configuration, pruning parameter and number of
@@ -152,8 +153,8 @@ mod tests {
 	use std::collections::HashSet;
 	use trie::MemoryDB;
 	use primitives::Blake2Hasher;
-	use backend::insert_into_memory_db;
-	use changes_trie::storage::InMemoryStorage;
+	use crate::backend::insert_into_memory_db;
+	use crate::changes_trie::storage::InMemoryStorage;
 	use super::*;
 
 	fn config(interval: u64, levels: u32) -> Configuration {

substrate/core/state-machine/src/changes_trie/storage.rs

@@ -22,15 +22,15 @@ use trie::DBValue;
 use heapsize::HeapSizeOf;
 use trie::MemoryDB;
 use parking_lot::RwLock;
-use changes_trie::{AnchorBlockId, RootsStorage, Storage};
-use trie_backend_essence::TrieBackendStorage;
+use crate::changes_trie::{AnchorBlockId, RootsStorage, Storage};
+use crate::trie_backend_essence::TrieBackendStorage;
 
 #[cfg(test)]
 use std::collections::HashSet;
 #[cfg(test)]
-use backend::insert_into_memory_db;
+use crate::backend::insert_into_memory_db;
 #[cfg(test)]
-use changes_trie::input::InputPair;
+use crate::changes_trie::input::InputPair;
 
 /// In-memory implementation of changes trie storage.
 pub struct InMemoryStorage<H: Hasher> where H::Out: HeapSizeOf {