Change OutputFormat enum to struct

cecton · cecton · commit cd86c583c926 · 2020-05-29T12:51:34.000+02:00
diff --git a/client/cli/src/runner.rs b/client/cli/src/runner.rs
@@ -212,7 +212,8 @@ impl<C: SubstrateCli> Runner<C> {
 		let prefix = self.config.informant_prefix.clone();
 		let service = service_builder(self.config)?;
 
-		let informant_future = sc_informant::build(&service, sc_informant::OutputFormat::Coloured {
+		let informant_future = sc_informant::build(&service, sc_informant::OutputFormat {
+			colors: true,
 			prefix,
 		});
 		let _informant_handle = self.tokio_runtime.spawn(informant_future);
diff --git a/client/informant/src/display.rs b/client/informant/src/display.rs
@@ -73,12 +73,12 @@ impl<B: BlockT> InformantDisplay<B> {
 			(SyncState::Downloading, Some(n)) => ("⚙️ ", format!("Syncing{}", speed), format!(", target=#{}", n)),
 		};
 
-		match &self.format {
-			OutputFormat::Coloured { prefix } => info!(
+		if self.format.colors {
+			info!(
 				target: "substrate",
 				"{} {}{}{} ({} peers), best: #{} ({}), finalized #{} ({}), {} {}",
 				level,
-				prefix,
+				self.format.prefix,
 				Colour::White.bold().paint(&status),
 				target,
 				Colour::White.bold().paint(format!("{}", num_connected_peers)),
@@ -88,12 +88,13 @@ impl<B: BlockT> InformantDisplay<B> {
 				info.chain.finalized_hash,
 				Colour::Green.paint(format!("⬇ {}", TransferRateFormat(net_status.average_download_per_sec))),
 				Colour::Red.paint(format!("⬆ {}", TransferRateFormat(net_status.average_upload_per_sec))),
-			),
-			OutputFormat::Plain { prefix } => info!(
+			)
+		} else {
+			info!(
 				target: "substrate",
 				"{} {}{}{} ({} peers), best: #{} ({}), finalized #{} ({}), ⬇ {} ⬆ {}",
 				level,
-				prefix,
+				self.format.prefix,
 				status,
 				target,
 				num_connected_peers,
@@ -103,7 +104,7 @@ impl<B: BlockT> InformantDisplay<B> {
 				info.chain.finalized_hash,
 				TransferRateFormat(net_status.average_download_per_sec),
 				TransferRateFormat(net_status.average_upload_per_sec),
-			),
+			)
 		}
 	}
 }
diff --git a/client/informant/src/lib.rs b/client/informant/src/lib.rs
@@ -30,13 +30,9 @@ mod display;
 
 /// The format to print telemetry output in.
 #[derive(Clone)]
-pub enum OutputFormat {
-	Coloured {
-		prefix: String,
-	},
-	Plain {
-		prefix: String,
-	},
+pub struct OutputFormat {
+	pub prefix: String,
+	pub colors: bool,
 }
 
 /// Creates an informant in the form of a `Future` that must be polled regularly.
@@ -101,16 +97,18 @@ pub fn build(service: &impl AbstractService, format: OutputFormat) -> impl futur
 			last_best = Some((n.header.number().clone(), n.hash.clone()));
 		}
 
-		match &format {
-			OutputFormat::Coloured { prefix } => info!(
+		if format.colors {
+			info!(
 				target: "substrate",
 				"✨ {}Imported #{} ({})",
-				prefix, Colour::White.bold().paint(n.header.number().to_string()), n.hash,
-			),
-			OutputFormat::Plain { prefix } => info!(
-				target: "substrate", "✨ {}Imported #{} ({})",
-				prefix, n.header.number(), n.hash,
-			),
+				format.prefix, Colour::White.bold().paint(n.header.number().to_string()), n.hash,
+			)
+		} else {
+			info!(
+				target: "substrate",
+				"✨ {}Imported #{} ({})",
+				format.prefix, n.header.number(), n.hash,
+			)
 		}
 
 		future::ready(())
diff --git a/utils/browser/src/lib.rs b/utils/browser/src/lib.rs
@@ -121,7 +121,7 @@ pub fn start_client(mut service: impl AbstractService) -> Client {
 	wasm_bindgen_futures::spawn_local(
 		sc_informant::build(
 			&service,
-			sc_informant::OutputFormat::Plain { prefix: Default::default() },
+			sc_informant::OutputFormat { colors: false, prefix: Default::default() },
 		).map(drop)
 	);
 
