From 2147092be0b0c5fa32507d0464b902de4034d5ce Mon Sep 17 00:00:00 2001
From: Leonardo Lima <oleonardolima@users.noreply.github.com>
Date: Thu, 2 Jun 2022 12:58:49 -0300
Subject: [PATCH] fix: apply suggestions from cargo clippy
---
src/bin.rs | 4 ++--
src/lib.rs | 4 ++--
src/mempool_space/mod.rs | 5 ++---
src/mempool_space/websocket.rs | 4 ++--
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/bin.rs b/src/bin.rs
index b918620..59da2ff 100644
--- a/src/bin.rs
+++ b/src/bin.rs
@@ -92,14 +92,14 @@ fn build_request_data(cli: &Cli) -> MempoolSpaceWebSocketRequestData {
match &cli.command {
Commands::AddressTracking { address } => {
return MempoolSpaceWebSocketRequestData::TrackAddress(
- Address::from_str(&address.as_str()).unwrap(),
+ Address::from_str(address.as_str()).unwrap(),
);
}
Commands::DataStream { blocks, .. } => {
if *blocks {
return MempoolSpaceWebSocketRequestData::Blocks;
}
- return MempoolSpaceWebSocketRequestData::MempoolBlocks;
+ MempoolSpaceWebSocketRequestData::MempoolBlocks
}
}
}
diff --git a/src/lib.rs b/src/lib.rs
index c768d4e..bb409e4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -19,8 +19,8 @@ pub async fn fetch_data_stream(
match data {
MempoolSpaceWebSocketRequestData::Blocks => {
- let message = build_websocket_request_message(&data);
- subscribe_to_new_blocks(&network, &message).await
+ let message = build_websocket_request_message(data);
+ subscribe_to_new_blocks(network, &message).await
}
MempoolSpaceWebSocketRequestData::MempoolBlocks => {
return Err(anyhow!(
diff --git a/src/mempool_space/mod.rs b/src/mempool_space/mod.rs
index 438f3c6..fb19f83 100644
--- a/src/mempool_space/mod.rs
+++ b/src/mempool_space/mod.rs
@@ -1,7 +1,6 @@
pub mod api;
pub mod websocket;
-use anyhow;
use api::{BlockEvent, MempoolSpaceWebSocketRequestData, MempoolSpaceWebSocketRequestMessage};
use bitcoin::Network;
use futures_core::Stream;
@@ -11,8 +10,8 @@ pub async fn subscribe_to_new_blocks(
network: &Network,
message: &MempoolSpaceWebSocketRequestMessage,
) -> anyhow::Result<impl Stream<Item = BlockEvent>> {
- let url: Url = url::Url::parse(&build_websocket_address(&network)).unwrap();
- websocket::connect_and_publish_message(url, &message).await
+ let url: Url = url::Url::parse(&build_websocket_address(network)).unwrap();
+ websocket::connect_and_publish_message(url, message).await
}
pub fn build_websocket_request_message(
diff --git a/src/mempool_space/websocket.rs b/src/mempool_space/websocket.rs
index 9e94e9a..2537672 100644
--- a/src/mempool_space/websocket.rs
+++ b/src/mempool_space/websocket.rs
@@ -16,7 +16,7 @@ pub async fn connect_and_publish_message(
let (mut websocket_stream, websocket_response) =
connect_async_tls_with_config(&url, None, None)
.await
- .expect(&format!("failed to connect with url: {}", &url));
+ .unwrap_or_else(|_| panic!("failed to connect with url: {}", &url));
log::info!("websocket handshake successfully completed!");
log::info!(
@@ -25,7 +25,7 @@ pub async fn connect_and_publish_message(
);
let item = serde_json::to_string(&message).unwrap();
- if let Err(_) = websocket_stream.send(Message::text(&item)).await {
+ if (websocket_stream.send(Message::text(&item)).await).is_err() {
log::error!("failed to publish first message to websocket");
return Err(anyhow!("failed to publish first message to websocket"));
};