Update to latest Polkadot & Substrate (#850)

* Update to latest Polkadot & Substrate

* More fixes

cumulus/client/cli/src/lib.rs

@@ -198,8 +198,9 @@ impl sc_cli::CliConfiguration for NormalizedRunCmd {
 	fn prometheus_config(
 		&self,
 		default_listen_port: u16,
+		chain_spec: &Box<dyn sc_cli::ChainSpec>,
 	) -> sc_cli::Result<Option<PrometheusConfig>> {
-		self.base.prometheus_config(default_listen_port)
+		self.base.prometheus_config(default_listen_port, chain_spec)
 	}
 
 	fn disable_grandpa(&self) -> sc_cli::Result<bool> {

cumulus/pallets/xcmp-queue/src/tests.rs

@@ -16,9 +16,7 @@
 use super::*;
 use cumulus_primitives_core::XcmpMessageHandler;
 use frame_support::assert_noop;
-#[cfg(debug_assertions)]
+use mock::{new_test_ext, Origin, Test, XcmpQueue};
-use mock::Test;
-use mock::{new_test_ext, Origin, XcmpQueue};
 
 #[test]
 fn one_message_does_not_panic() {

cumulus/parachain-template/node/src/command.rs

@@ -351,8 +351,12 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.rpc_ws(default_listen_port)
 	}
 
-	fn prometheus_config(&self, default_listen_port: u16) -> Result<Option<PrometheusConfig>> {
+	fn prometheus_config(
-		self.base.base.prometheus_config(default_listen_port)
+		&self,
+		default_listen_port: u16,
+		chain_spec: &Box<dyn ChainSpec>,
+	) -> Result<Option<PrometheusConfig>> {
+		self.base.base.prometheus_config(default_listen_port, chain_spec)
 	}
 
 	fn init<C: SubstrateCli>(&self) -> Result<()> {

cumulus/parachain-template/node/src/service.rs

@@ -114,6 +114,7 @@ where
 		config.wasm_method,
 		config.default_heap_pages,
 		config.max_runtime_instances,
+		config.runtime_cache_size,
 	);
 
 	let (client, backend, keystore_container, task_manager) =

cumulus/polkadot-parachains/src/command.rs

@@ -587,8 +587,12 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.rpc_ws(default_listen_port)
 	}
 
-	fn prometheus_config(&self, default_listen_port: u16) -> Result<Option<PrometheusConfig>> {
+	fn prometheus_config(
-		self.base.base.prometheus_config(default_listen_port)
+		&self,
+		default_listen_port: u16,
+		chain_spec: &Box<dyn ChainSpec>,
+	) -> Result<Option<PrometheusConfig>> {
+		self.base.base.prometheus_config(default_listen_port, chain_spec)
 	}
 
 	fn init<C: SubstrateCli>(&self) -> Result<()> {

cumulus/polkadot-parachains/src/service.rs

@@ -211,6 +211,7 @@ where
 		config.wasm_method,
 		config.default_heap_pages,
 		config.max_runtime_instances,
+		config.runtime_cache_size,
 	);
 
 	let (client, backend, keystore_container, task_manager) =

cumulus/test/client/src/lib.rs

@@ -185,6 +185,7 @@ pub fn validate_block(
 		sp_io::SubstrateHostFunctions::host_functions(),
 		1,
 		None,
+		2,
 	);
 
 	executor

cumulus/test/service/src/lib.rs

@@ -124,6 +124,7 @@ pub fn new_partial(
 		config.wasm_method,
 		config.default_heap_pages,
 		config.max_runtime_instances,
+		config.runtime_cache_size,
 	);
 
 	let (client, backend, keystore_container, task_manager) =
@@ -639,6 +640,7 @@ pub fn node_config(
 		base_path: Some(base_path),
 		informant_output_format: Default::default(),
 		wasm_runtime_overrides: None,
+		runtime_cache_size: 2,
 	})
 }