Cleanup

paritytech · gavofyork · Aug 9, 2018 · Jul 11, 2018 · Jul 11, 2018 · Jul 11, 2018
commit 35b29babf5f0b602abd7d45d2dae9018327e5e53
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/polkadot/runtime/src/parachains.rs b/polkadot/runtime/src/parachains.rs
@@ -30,7 +30,7 @@ use substrate_runtime_support::dispatch::Result;
 use rstd::marker::PhantomData;
 
 #[cfg(any(feature = "std", test))]
-use {runtime_primitives};
+use runtime_primitives;
 
 #[cfg(any(feature = "std", test))]
 use std::collections::HashMap;

diff --git a/polkadot/runtime/wasm/Cargo.lock b/polkadot/runtime/wasm/Cargo.lock
diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
diff --git a/substrate/cli/src/lib.rs b/substrate/cli/src/lib.rs
@@ -26,7 +26,6 @@ extern crate ansi_term;
 extern crate regex;
 extern crate time;
 extern crate fdlimit;
-
 extern crate futures;
 extern crate tokio;
 extern crate names;

diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml
@@ -24,9 +24,9 @@ substrate-runtime-primitives = { path = "../runtime/primitives" }
 substrate-state-machine = { path = "../state-machine" }
 substrate-keyring = { path = "../../substrate/keyring" }
 substrate-telemetry = { path = "../telemetry" }
-hashdb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
-patricia-trie = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
-rlp = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
+hashdb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
+patricia-trie = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
+rlp = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
 
 [dev-dependencies]
 substrate-test-client = { path = "../test-client" }
diff --git a/substrate/client/db/Cargo.toml b/substrate/client/db/Cargo.toml
@@ -6,10 +6,10 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 parking_lot = "0.4"
 log = "0.3"
-kvdb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
-kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
-hashdb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
-memorydb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
+kvdb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
+kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
+hashdb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
+memorydb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
 substrate-primitives = { path = "../../../substrate/primitives" }
 substrate-runtime-primitives = { path = "../../../substrate/runtime/primitives" }
 substrate-client = { path = "../../../substrate/client" }
@@ -20,4 +20,4 @@ substrate-executor = { path = "../../../substrate/executor" }
 substrate-state-db = { path = "../../../substrate/state-db" }
 
 [dev-dependencies]
-kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
+kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
diff --git a/substrate/client/db/src/lib.rs b/substrate/client/db/src/lib.rs
@@ -115,7 +115,7 @@ struct PendingBlock<Block: BlockT> {
 struct StateMetaDb<'a>(&'a KeyValueDB);
 
 impl<'a> state_db::MetaDb for StateMetaDb<'a> {
-	type Error = io::Error; // REVIEW: `kvdb::Error` is gone (https://github.com/paritytech/parity-ethereum/pull/8924/files#diff-ead7c616cf8709a265c3297ad8dbfccdL36) and replaced with `io:Error` in other places – is that ok here too?
+	type Error = io::Error;
 
 	fn get_meta(&self, key: &[u8]) -> Result<Option<Vec<u8>>, Self::Error> {
 		self.0.get(columns::STATE_META, key).map(|r| r.map(|v| v.to_vec()))
@@ -271,7 +271,7 @@ impl<Block: BlockT> state_machine::Storage<BlakeHasher> for StorageDb<Block> {
 }
 
 impl<Block: BlockT> state_db::HashDb for StorageDb<Block> {
-	type Error = io::Error; // REVIEW: `kvdb::Error` was removed (see above)
+	type Error = io::Error;
 	type Hash = H256;
 
 	fn get(&self, key: &H256) -> Result<Option<Vec<u8>>, Self::Error> {
@@ -308,7 +308,6 @@ impl<Block: BlockT> Backend<Block> {
 	fn from_kvdb(db: Arc<KeyValueDB>, pruning: PruningMode, finalization_window: u64) -> Result<Self, client::error::Error> {
 		let blockchain = BlockchainDb::new(db.clone())?;
 		let map_e = |e: state_db::Error<io::Error>| ::client::error::Error::from(format!("State database error: {:?}", e));
-		// let map_e = |e: state_db::Error<kvdb::Error>| ::client::error::Error::from(format!("State database error: {:?}", e));
 		let state_db: StateDb<Block::Hash, H256> = StateDb::new(pruning, &StateMetaDb(&*db)).map_err(map_e)?;
 		let storage_db = StorageDb {
 			db,

diff --git a/substrate/client/db/src/utils.rs b/substrate/client/db/src/utils.rs
@@ -86,13 +86,7 @@ pub fn db_key_to_number<N>(key: &[u8]) -> client::error::Result<N> where N: As<u
 /// Maps database error to client error
 pub fn db_err(err: io::Error) -> client::error::Error {
 	use std::error::Error;
-	// REVIEW: not sure what value the `Io`/`Msg` kinds had or what we want to do here
 	client::error::ErrorKind::Backend(err.description().into()).into()
-	// match err.kind() {
-	// 	&kvdb::ErrorKind::Io(ref err) => client::error::ErrorKind::Backend(err.description().into()).into(),
-	// 	&kvdb::ErrorKind::Msg(ref m) => client::error::ErrorKind::Backend(m.clone()).into(),
-	// 	_ => client::error::ErrorKind::Backend("Unknown backend error".into()).into(),
-	// }
 }
 
 /// Open RocksDB database.

diff --git a/substrate/client/src/in_mem.rs b/substrate/client/src/in_mem.rs
@@ -359,7 +359,7 @@ where
 			let hash = header.hash();
 			let parent_hash = *header.parent_hash();
 
-			self.states.write().insert(hash, operation.new_state.unwrap_or_else(|| old_state.clone())); // REVIEW: this was `.unwrap_or_else(|| old_state.clone())` – but ther compiler complained about trying to insert a rference into the hash map. Not sure how that could have worked before?
+			self.states.write().insert(hash, operation.new_state.unwrap_or_else(|| old_state.clone()));
 			self.blockchain.insert(hash, header, justification, body, pending_block.is_best);
 			// dumb implementation - store value for each block
 			if pending_block.is_best {

diff --git a/substrate/executor/Cargo.toml b/substrate/executor/Cargo.toml
@@ -21,7 +21,7 @@ twox-hash = "1.1.0"
 lazy_static = "1.0"
 parking_lot = "*"
 log = "0.3"
-hashdb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
+hashdb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
 
 [dev-dependencies]
 assert_matches = "1.1"

diff --git a/substrate/executor/src/wasm_executor.rs b/substrate/executor/src/wasm_executor.rs
@@ -141,7 +141,7 @@ impl ReadPrimitive<u32> for MemoryInstance {
 	}
 }
 
-// REVIEW: this macro does not support `where` clauses and that seems somewhat tricky to add
+// TODO: this macro does not support `where` clauses and that seems somewhat tricky to add
 impl_function_executor!(this: FunctionExecutor<'e, E>,
 	ext_print_utf8(utf8_data: *const u8, utf8_len: u32) => {
 		if let Ok(utf8) = this.memory.get(utf8_data, utf8_len as usize) {

diff --git a/substrate/primitives/Cargo.toml b/substrate/primitives/Cargo.toml
@@ -8,20 +8,19 @@ crunchy = "0.1"
 substrate-runtime-std = { path = "../runtime-std", default_features = false }
 substrate-codec = { path = "../codec", default_features = false }
 elastic-array = {version = "0.10", optional = true }
-fixed-hash = { git = "https://github.com/paritytech/parity-common", default_features = false, branch = "refactor/no_std-friendly" }
+fixed-hash = { git = "https://github.com/paritytech/parity-common", default_features = false, branch = "temp/combined-hashdb-plain_hasher-changes" }
 rustc-hex = { version = "2.0", default_features = false }
 serde = { version = "1.0", default_features = false }
 serde_derive = { version = "1.0", optional = true }
-# TODO: Used to fetch `uint` from "https://github.com/rphmeier/primitives.git" – what was `compile-for-wasm` adding?
-uint = { git = "https://github.com/paritytech/parity-common", default_features = false, branch = "refactor/no_std-friendly" }
-rlp = { git = "https://github.com/paritytech/parity-common", optional = true, branch = "refactor/no_std-friendly" }
+uint = { git = "https://github.com/paritytech/parity-common", default_features = false, branch = "temp/combined-hashdb-plain_hasher-changes" }
+rlp = { git = "https://github.com/paritytech/parity-common", optional = true, branch = "temp/combined-hashdb-plain_hasher-changes" }
 twox-hash = { version = "1.1.0", optional = true }
 byteorder = { version = "1.1", default_features = false }
 blake2-rfc = { version = "0.2.18", optional = true }
 wasmi = { version = "0.4", optional = true }
-hashdb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly", default_features = false }
-patricia-trie = { git = "https://github.com/paritytech/parity-common", optional = true, branch = "refactor/no_std-friendly" }
-plain_hasher = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly", default_features = false }
+hashdb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes", default_features = false }
+patricia-trie = { git = "https://github.com/paritytech/parity-common", optional = true, branch = "temp/combined-hashdb-plain_hasher-changes" }
+plain_hasher = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes", default_features = false }
 
 [dev-dependencies]
 substrate-serializer = { path = "../serializer" }

diff --git a/substrate/primitives/src/hash.rs b/substrate/primitives/src/hash.rs
@@ -86,7 +86,6 @@ impl_rest!(H160, 20);
 impl_rest!(H256, 32);
 impl_rest!(H512, 64);
 
-
 #[cfg(test)]
 mod tests {
 	use super::*;

diff --git a/substrate/primitives/src/uint.rs b/substrate/primitives/src/uint.rs
@@ -66,7 +66,6 @@ mod tests {
 					($name::from(1_000), "0x3e8"),
 					($name::from(100_000), "0x186a0"),
 					($name::from(u64::max_value()), "0xffffffffffffffff"),
-					// TODO: `uint` doesn't have the same conversion facilities as `ethereum_types::H256` – need to port over the manual impls from `ethereum-types` to the macro so we can to `1.into()`
 					($name::from(u64::max_value()) + $name::from(1), "0x10000000000000000"),
 				];
 

diff --git a/substrate/runtime-io/with_std.rs b/substrate/runtime-io/with_std.rs
@@ -36,8 +36,6 @@ use primitives::H256;
 
 // TODO: use the real error, not NoError.
 
-// REVIEW:	The `environmental!` machinery can't really work with generics so need a concrete impl here.
-// 			This means that consumers of the generated code can't use generics either?
 environmental!(ext: trait Externalities<BlakeHasher>);
 
 /// Get `key` from storage and return a `Vec`, empty if there's a problem.
@@ -94,7 +92,6 @@ pub fn chain_id() -> u64 {
 }
 
 /// "Commit" all existing operations and get the resultant storage root.
-// TODO: this used to be: `pub fn storage_root() -> [u8; 32]` – does it really need to use H256?
 pub fn storage_root() -> H256 {
 	ext::with(|ext|
 		ext.storage_root()
@@ -130,7 +127,7 @@ pub fn ed25519_verify<P: AsRef<[u8]>>(sig: &[u8; 64], msg: &[u8], pubkey: P) ->
 
 /// Execute the given closure with global function available whose functionality routes into the
 /// externalities `ext`. Forwards the value that the closure returns.
-// TODO: need a concrete hasher here due to limitations of the `environmental!` macro, otherwise a type param would have been fine I think.
+// NOTE: need a concrete hasher here due to limitations of the `environmental!` macro, otherwise a type param would have been fine I think.
 pub fn with_externalities<R, F: FnOnce() -> R>(ext: &mut Externalities<BlakeHasher>, f: F) -> R {
 	ext::using(ext, f)
 }

diff --git a/substrate/runtime/council/src/lib.rs b/substrate/runtime/council/src/lib.rs
@@ -616,7 +616,7 @@ impl<T: Trait> primitives::BuildStorage for GenesisConfig<T>
 
 #[cfg(test)]
 mod tests {
-	// These `pub` are here for a reason, edit with care
+	// These re-exports are here for a reason, edit with care
 	pub use super::*;
 	pub use runtime_io::with_externalities;
 	pub use substrate_primitives::H256;

diff --git a/substrate/runtime/system/src/lib.rs b/substrate/runtime/system/src/lib.rs
@@ -207,10 +207,6 @@ impl<T: Trait> Default for GenesisConfig<T> {
 #[cfg(any(feature = "std", test))]
 impl<T: Trait> primitives::BuildStorage for GenesisConfig<T>
 {
-	// TODO: I don't think passing a StorageMap instead of a TextExternalities can work here, as
-	// StorageMap does not implement the Externalities trait, but it compiles and there are no tests
-	// so…
-	// fn build_storage(self) -> Result<runtime_io::TestExternalities<BlakeHasher>, String> {
 	fn build_storage(self) -> Result<primitives::StorageMap, String> {
 		use codec::Encode;
 

diff --git a/substrate/state-machine/Cargo.toml b/substrate/state-machine/Cargo.toml
@@ -13,8 +13,8 @@ heapsize = "0.4"
 
 substrate-primitives = { path = "../primitives", version = "0.1.0" }
 
-hashdb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
-memorydb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
-patricia-trie = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
-triehash = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
-rlp = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
+hashdb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
+memorydb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
+patricia-trie = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
+triehash = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
+rlp = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }
diff --git a/substrate/state-machine/src/trie_backend.rs b/substrate/state-machine/src/trie_backend.rs
@@ -198,7 +198,6 @@ pub struct Ephemeral<'a, H: 'a + Hasher> {
 	overlay: &'a mut MemoryDB<H>,
 }
 
-// REVIEW: this is boiler plate, need macro?
 impl<'a, H: Hasher> AsHashDB<H> for Ephemeral<'a, H> where H::Out: HeapSizeOf {
 	fn as_hashdb(&self) -> &HashDB<H> { self }
 	fn as_hashdb_mut(&mut self) -> &mut HashDB<H> { self }

diff --git a/substrate/test-client/Cargo.toml b/substrate/test-client/Cargo.toml
@@ -14,5 +14,5 @@ substrate-primitives = { path = "../primitives" }
 substrate-runtime-support = { path = "../runtime-support" }
 substrate-test-runtime = { path = "../test-runtime" }
 substrate-runtime-primitives = { path = "../runtime/primitives" }
-hashdb = { git = "https://github.com/paritytech/parity-common", branch = "refactor/no_std-friendly" }
+hashdb = { git = "https://github.com/paritytech/parity-common", branch = "temp/combined-hashdb-plain_hasher-changes" }