Renamed NetworkConfigurationParams to NetworkParams for consistency sake

cecton · cecton · commit 53e8ec2409f6 · 2020-04-03T14:17:48.000+02:00
diff --git a/client/cli/src/commands/mod.rs b/client/cli/src/commands/mod.rs
@@ -139,9 +139,9 @@ macro_rules! substrate_cli_subcommands {
 				}
 			}
 
-			fn network_configuration_params(&self) -> Option<&::sc_cli::NetworkConfigurationParams> {
+			fn network_params(&self) -> Option<&::sc_cli::NetworkParams> {
 				match self {
-					$($enum::$variant(cmd) => cmd.network_configuration_params()),*
+					$($enum::$variant(cmd) => cmd.network_params()),*
 				}
 			}
 
diff --git a/client/cli/src/commands/runcmd.rs b/client/cli/src/commands/runcmd.rs
@@ -17,7 +17,7 @@
 use crate::error::{Error, Result};
 use crate::params::ImportParams;
 use crate::params::KeystoreParams;
-use crate::params::NetworkConfigurationParams;
+use crate::params::NetworkParams;
 use crate::params::SharedParams;
 use crate::params::TransactionPoolParams;
 use crate::CliConfiguration;
@@ -191,7 +191,7 @@ pub struct RunCmd {
 
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
-	pub network_config: NetworkConfigurationParams,
+	pub network_params: NetworkParams,
 
 	#[allow(missing_docs)]
 	#[structopt(flatten)]
@@ -281,8 +281,8 @@ impl CliConfiguration for RunCmd {
 		Some(&self.import_params)
 	}
 
-	fn network_configuration_params(&self) -> Option<&NetworkConfigurationParams> {
-		Some(&self.network_config)
+	fn network_params(&self) -> Option<&NetworkParams> {
+		Some(&self.network_params)
 	}
 
 	fn keystore_params(&self) -> Option<&KeystoreParams> {
diff --git a/client/cli/src/config.rs b/client/cli/src/config.rs
@@ -18,7 +18,7 @@
 
 use crate::error::Result;
 use crate::{
-	init_logger, ImportParams, KeystoreParams, NetworkConfigurationParams, NodeKeyParams,
+	init_logger, ImportParams, KeystoreParams, NetworkParams, NodeKeyParams,
 	PruningParams, SharedParams, SubstrateCli,
 };
 use app_dirs::{AppDataType, AppInfo};
@@ -61,14 +61,14 @@ pub trait CliConfiguration: Sized {
 		None
 	}
 
-	/// Get the NetworkConfigurationParams for this object
-	fn network_configuration_params(&self) -> Option<&NetworkConfigurationParams> {
+	/// Get the NetworkParams for this object
+	fn network_params(&self) -> Option<&NetworkParams> {
 		None
 	}
 
 	/// Get the NodeKeyParams for this object
 	fn node_key_params(&self) -> Option<&NodeKeyParams> {
-		self.network_configuration_params()
+		self.network_params()
 			.map(|x| &x.node_key_params)
 	}
 
@@ -102,8 +102,8 @@ pub trait CliConfiguration: Sized {
 		node_name: &str,
 		node_key: NodeKeyConfig,
 	) -> Result<NetworkConfiguration> {
-		if let Some(network_configuration_params) = self.network_configuration_params() {
-			network_configuration_params.network_config(
+		if let Some(network_params) = self.network_params() {
+			network_params.network_config(
 				chain_spec,
 				is_dev,
 				net_config_dir,
diff --git a/client/cli/src/params/mod.rs b/client/cli/src/params/mod.rs
@@ -16,7 +16,7 @@
 
 mod import_params;
 mod keystore_params;
-mod network_configuration_params;
+mod network_params;
 mod node_key_params;
 mod pruning_params;
 mod shared_params;
@@ -27,7 +27,7 @@ use std::str::FromStr;
 
 pub use crate::params::import_params::*;
 pub use crate::params::keystore_params::*;
-pub use crate::params::network_configuration_params::*;
+pub use crate::params::network_params::*;
 pub use crate::params::node_key_params::*;
 pub use crate::params::pruning_params::*;
 pub use crate::params::shared_params::*;
diff --git a/client/cli/src/params/network_params.rs b/client/cli/src/params/network_params.rs
@@ -28,7 +28,7 @@ use structopt::StructOpt;
 
 /// Parameters used to create the network configuration.
 #[derive(Debug, StructOpt, Clone)]
-pub struct NetworkConfigurationParams {
+pub struct NetworkParams {
 	/// Specify a list of bootnodes.
 	#[structopt(long = "bootnodes", value_name = "URL")]
 	pub bootnodes: Vec<String>,
@@ -104,7 +104,7 @@ pub struct NetworkConfigurationParams {
 	pub use_yamux_flow_control: bool,
 }
 
-impl NetworkConfigurationParams {
+impl NetworkParams {
 	/// Fill the given `NetworkConfiguration` by looking at the cli parameters.
 	pub fn network_config(
 		&self,

Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,9 @@ macro_rules! substrate_cli_subcommands {`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
`142`		`- fn network_configuration_params(&self) -> Option<&::sc_cli::NetworkConfigurationParams> {`
	`142`	`+ fn network_params(&self) -> Option<&::sc_cli::NetworkParams> {`
`143`	`143`	`match self {`
`144`		`- $($enum::$variant(cmd) => cmd.network_configuration_params()),*`
	`144`	`+ $($enum::$variant(cmd) => cmd.network_params()),*`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`