Merge branch 'master' into rh-translate-linked-map

Author: rphmeier

Cargo.lock

@@ -628,6 +628,8 @@ fn fill_network_configuration(
 		wasm_external_transport: None,
 	};
 
+	config.max_parallel_downloads = cli.max_parallel_downloads;
+
 	Ok(())
 }
 

core/cli/src/lib.rs

@@ -146,11 +146,11 @@ pub struct NetworkConfigurationParams {
 	pub port: Option<u16>,
 
 	/// Specify the number of outgoing connections we're trying to maintain.
-	#[structopt(long = "out-peers", value_name = "OUT_PEERS", default_value = "25")]
+	#[structopt(long = "out-peers", value_name = "COUNT", default_value = "25")]
 	pub out_peers: u32,
 
 	/// Specify the maximum number of incoming connections we're accepting.
-	#[structopt(long = "in-peers", value_name = "IN_PEERS", default_value = "25")]
+	#[structopt(long = "in-peers", value_name = "COUNT", default_value = "25")]
 	pub in_peers: u32,
 
 	/// Disable mDNS discovery.
@@ -160,6 +160,13 @@ pub struct NetworkConfigurationParams {
 	#[structopt(long = "no-mdns")]
 	pub no_mdns: bool,
 
+	/// Maximum number of peers to ask the same blocks in parallel.
+	///
+	/// This allows downlading announced blocks from multiple peers. Decrease to save
+	/// traffic and risk increased latency.
+	#[structopt(long = "max-parallel-downloads", value_name = "COUNT", default_value = "5")]
+	pub max_parallel_downloads: u32,
+
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
 	pub node_key_params: NodeKeyParams

core/cli/src/params.rs

@@ -155,13 +155,12 @@ impl<B: BlockT, H: Hasher> Cache<B, H> {
 
 	/// Synchronize the shared cache with the best block state.
 	/// This function updates the shared cache by removing entries
-	/// that are invalidated by chain reorganization. It should be
-	/// be called when chain reorg happens without importing a new block.
+	/// that are invalidated by chain reorganization. It should be called
+	/// externally when chain reorg happens without importing a new block.
 	pub fn sync(&mut self, enacted: &[B::Hash], retracted: &[B::Hash]) {
 		trace!("Syncing shared cache, enacted = {:?}, retracted = {:?}", enacted, retracted);
 
 		// Purge changes from re-enacted and retracted blocks.
-		// Filter out commiting block if any.
 		let mut clear = false;
 		for block in enacted {
 			clear = clear || {
@@ -313,6 +312,7 @@ impl<H: Hasher, B: BlockT> CacheChanges<H, B> {
 		let is_best = is_best();
 		trace!("Syncing cache, id = (#{:?}, {:?}), parent={:?}, best={}", commit_number, commit_hash, self.parent_hash, is_best);
 		let cache = &mut *cache;
+		// Filter out commiting block if any.
 		let enacted: Vec<_> = enacted
 			.iter()
 			.filter(|h| commit_hash.as_ref().map_or(true, |p| *h != p))
@@ -370,7 +370,7 @@ impl<H: Hasher, B: BlockT> CacheChanges<H, B> {
 				modifications.insert(k);
 			}
 
-			// Save modified storage. These are ordered by the block number.
+			// Save modified storage. These are ordered by the block number in reverse.
 			let block_changes = BlockChanges {
 				storage: modifications,
 				child_storage: child_modifications,
@@ -427,10 +427,10 @@ impl<H: Hasher, S: StateBackend<H>, B: BlockT> CachingState<H, S, B> {
 			}
 			Some(ref parent) => parent,
 		};
-		// Ignore all storage modified in later blocks
+		// Ignore all storage entries modified in later blocks.
 		// Modifications contains block ordered by the number
 		// We search for our parent in that list first and then for
-		// all its parent until we hit the canonical block,
+		// all its parents until we hit the canonical block,
 		// checking against all the intermediate modifications.
 		for m in modifications {
 			if &m.hash == parent {

core/client/db/src/storage_cache.rs

@@ -497,7 +497,7 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where
 	/// Get longest range within [first; last] that is possible to use in `key_changes`
 	/// and `key_changes_proof` calls.
 	/// Range could be shortened from the beginning if some changes tries have been pruned.
-	/// Returns Ok(None) if changes trues are not supported.
+	/// Returns Ok(None) if changes tries are not supported.
 	pub fn max_key_changes_range(
 		&self,
 		first: NumberFor<Block>,