chore: fix clippy (#864)

* clippy fix

* fix more clippy

* cargo fmt

src/commands/monitor.rs

@@ -323,7 +323,7 @@ where
 	let _lock = submit_lock.lock().await;
 
 	let (solution, score) = match epm::fetch_snapshot_and_mine_solution::<T>(
-		&client.chain_api(),
+		client.chain_api(),
 		Some(block_hash),
 		config.solver,
 		round,

src/epm.rs

@@ -149,7 +149,7 @@ where
 			targets.remove(&rm);
 		}
 
-		return Err(Error::Feasibility("Failed to pre-trim weight < T::MaxLength".to_string()));
+		Err(Error::Feasibility("Failed to pre-trim weight < T::MaxLength".to_string()))
 	}
 
 	/// Clone the state and trim it, so it get can be reverted.

src/error.rs

@@ -23,7 +23,7 @@ pub enum Error {
 	#[error("I/O error: `{0}`")]
 	Io(#[from] std::io::Error),
 	#[error("RPC error: `{0}`")]
-	RpcError(#[from] jsonrpsee::core::ClientError),
+	Rpc(#[from] jsonrpsee::core::ClientError),
 	#[error("subxt error: `{0}`")]
 	Subxt(#[from] subxt::Error),
 	#[error("Crypto error: `{0:?}`")]
@@ -51,7 +51,7 @@ pub enum Error {
 	#[error("Feasibility error: {0}")]
 	Feasibility(String),
 	#[error("{0}")]
-	JoinError(#[from] tokio::task::JoinError),
+	Join(#[from] tokio::task::JoinError),
 	#[error("Empty snapshot")]
 	EmptySnapshot,
 }

src/helpers.rs

@@ -86,7 +86,7 @@ pub fn kill_main_task_if_critical_err(tx: &tokio::sync::mpsc::UnboundedSender<Er
 		Error::BetterScoreExist |
 		Error::IncorrectPhase |
 		Error::TransactionRejected(_) |
-		Error::JoinError(_) |
+		Error::Join(_) |
 		Error::Feasibility(_) |
 		Error::EmptySnapshot => {},
 		Error::Subxt(SubxtError::Rpc(rpc_err)) => {

tests/common.rs

@@ -94,7 +94,7 @@ pub fn run_polkadot_node(chain: Chain) -> (KillChildOnDrop, String) {
 			.stderr(process::Stdio::piped())
 			.args([
 				"--chain",
-				&chain_str,
+				chain_str,
 				"--tmp",
 				"--alice",
 				"--unsafe-force-node-key-generation",
@@ -141,14 +141,16 @@ pub fn spawn_cli_output_threads(
 ) {
 	let tx2 = tx.clone();
 	std::thread::spawn(move || {
-		for line in BufReader::new(stdout).lines().flatten() {
+		for line in BufReader::new(stdout).lines() {
+			let line = line.expect("Failed to read line from stdout");
 			println!("OK: {}", line);
 			let _ = tx2.send(line);
 		}
 	});
 
 	std::thread::spawn(move || {
-		for line in BufReader::new(stderr).lines().flatten() {
+		for line in BufReader::new(stderr).lines() {
+			let line = line.expect("Failed to read line from stdout");
 			println!("ERR: {}", line);
 			let _ = tx.send(line);
 		}