Merge branch 'master' of github.com:paritytech/substrate into a-dyn-spec

utils/browser/src/lib.rs

@@ -34,10 +34,8 @@ pub use console_log::init_with_level as init_console_log;
 /// Create a service configuration from a chain spec.
 ///
 /// This configuration contains good defaults for a browser light client.
-pub async fn browser_configuration<G, E>(
-	transport: Transport,
-	chain_spec: GenericChainSpec<G, E>,
-) -> Result<Configuration, Box<dyn std::error::Error>>
+pub async fn browser_configuration<G, E>(chain_spec: GenericChainSpec<G, E>)
+	-> Result<Configuration, Box<dyn std::error::Error>>
 where
 	G: RuntimeGenesis + 'static,
 	E: Extension + 'static,

utils/frame/benchmarking-cli/src/lib.rs

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::fmt::Debug;
 use sp_runtime::{traits::{Block as BlockT, Header as HeaderT, NumberFor}};
 use sc_client::StateMachine;
 use sc_cli::{ExecutionStrategy, WasmExecutionMethod, VersionInfo};
@@ -165,9 +166,13 @@ impl BenchmarkCmd {
 		&self,
 		mut config: &mut Configuration,
 		spec_factory: impl FnOnce(&str) -> Result<Box<dyn ChainSpec>, String>,
-		version: &VersionInfo,
-	) -> sc_cli::Result<()> {
-		self.shared_params.update_config(&mut config, spec_factory, version)?;
+		_version: &VersionInfo,
+	) -> sc_cli::Result<()>
+	{
+		// Configure chain spec.
+		let chain_key = self.shared_params.chain.clone().unwrap_or("dev".into());
+		let spec = spec_factory(&chain_key)?;
+		config.chain_spec = Some(spec);
 
 		// Make sure to configure keystore.
 		config.use_in_memory_keystore()?;