fix cli: make port Option<u16> again (#14088)

This commit is contained in:
Niklas Adolfsson
2023-05-07 21:11:03 +02:00
committed by GitHub
parent c8b66415bb
commit bd96f00146
8 changed files with 35 additions and 15 deletions
+2
View File
@@ -101,6 +101,8 @@ pub struct Configuration {
pub rpc_id_provider: Option<Box<dyn crate::RpcSubscriptionIdProvider>>,
/// Maximum allowed subscriptions per rpc connection
pub rpc_max_subs_per_conn: u32,
/// JSON-RPC server default port.
pub rpc_port: u16,
/// Prometheus endpoint configuration. `None` if disabled.
pub prometheus_config: Option<PrometheusConfig>,
/// Telemetry service URL. `None` if disabled.
+1 -1
View File
@@ -386,7 +386,7 @@ where
addr
};
let addr = config.rpc_addr.unwrap_or(([127, 0, 0, 1], 9944).into());
let addr = config.rpc_addr.unwrap_or_else(|| ([127, 0, 0, 1], config.rpc_port).into());
let backup_addr = backup_port(addr);
let metrics = sc_rpc_server::RpcMetrics::new(config.prometheus_registry())?;