Remove unnecessary match expressions

Author: jkczyz

lightning-block-sync/src/lib.rs

@@ -363,10 +363,9 @@ async fn sync_chain_monitor<CL: ChainListener + Sized, P: Poll>(new_header: Vali
 
 	for event in events.drain(..).rev() {
 		if let ForkStep::ConnectBlock(header) = event {
-			let block = match chain_poller.fetch_block(&header).await {
-				Err(e) => return Err((e, new_tip)),
-				Ok(b) => b,
-			};
+			let block = chain_poller
+				.fetch_block(&header).await
+				.or_else(|e| Err((e, new_tip)))?;
 			debug_assert_eq!(block.block_hash, header.block_hash);
 			println!("Connecting block {}", header.block_hash.to_hex());
 			chain_notifier.block_connected(&block, header.height);

lightning-block-sync/src/poller.rs

@@ -20,22 +20,18 @@ impl<'b, B: DerefMut<Target=dyn BlockSource + 'b> + Sized + Sync + Send> Poll fo
 		AsyncBlockSourceResult<'a, ChainTip>
 	{
 		Box::pin(async move {
-			match self.block_source.get_best_block().await {
-				Err(e) => Err(e),
-				Ok((block_hash, height)) => {
-					if block_hash == best_chain_tip.header.block_hash() {
-						return Ok(ChainTip::Common);
-					}
-
-					let chain_tip = self.block_source
-						.get_header(&block_hash, height).await?
-						.validate(block_hash)?;
-					if chain_tip.chainwork > best_chain_tip.chainwork {
-						Ok(ChainTip::Better(chain_tip))
-					} else {
-						Ok(ChainTip::Worse(chain_tip))
-					}
-				},
+			let (block_hash, height) = self.block_source.get_best_block().await?;
+			if block_hash == best_chain_tip.header.block_hash() {
+				return Ok(ChainTip::Common);
+			}
+
+			let chain_tip = self.block_source
+				.get_header(&block_hash, height).await?
+				.validate(block_hash)?;
+			if chain_tip.chainwork > best_chain_tip.chainwork {
+				Ok(ChainTip::Better(chain_tip))
+			} else {
+				Ok(ChainTip::Worse(chain_tip))
 			}
 		})
 	}