From 67b0100d67c57b7c0131adb3cd3070aaefd79ae9 Mon Sep 17 00:00:00 2001
From: Santiago Carmuega <santiago@carmuega.me>
Date: Thu, 9 Nov 2023 17:59:10 -0300
Subject: [PATCH] tidy up

---
 examples/n2c-miniprotocols/src/main.rs        | 33 ++++++++-----------
 .../src/miniprotocols/localstate/client.rs    |  7 ++--
 .../src/miniprotocols/localstate/protocol.rs  |  1 -
 .../localstate/queries_v16/codec.rs           |  6 ++--
 4 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/examples/n2c-miniprotocols/src/main.rs b/examples/n2c-miniprotocols/src/main.rs
index ccede3a1..00072ba4 100644
--- a/examples/n2c-miniprotocols/src/main.rs
+++ b/examples/n2c-miniprotocols/src/main.rs
@@ -1,39 +1,30 @@
 use pallas::network::{
     facades::NodeClient,
-    miniprotocols::{
-        chainsync,
-        localstate::{self, queries_v16},
-        Point, MAINNET_MAGIC, PRE_PRODUCTION_MAGIC,
-    },
+    miniprotocols::{chainsync, localstate::queries_v16, Point, PRE_PRODUCTION_MAGIC},
 };
-use pallas_codec::utils::AnyCbor;
 use tracing::info;
 
 async fn do_localstate_query(client: &mut NodeClient) {
-    client.statequery().acquire(None).await.unwrap();
+    let client = client.statequery();
 
-    let result = queries_v16::get_chain_point(client.statequery())
-        .await
-        .unwrap();
+    client.acquire(None).await.unwrap();
+
+    let result = queries_v16::get_chain_point(client).await.unwrap();
     info!("result: {:?}", result);
 
-    let result = queries_v16::get_system_start(client.statequery())
-        .await
-        .unwrap();
+    let result = queries_v16::get_system_start(client).await.unwrap();
     info!("result: {:?}", result);
 
-    let era = queries_v16::get_current_era(client.statequery())
-        .await
-        .unwrap();
+    let era = queries_v16::get_current_era(client).await.unwrap();
     info!("result: {:?}", era);
 
-    let result = queries_v16::get_block_epoch_number(client.statequery(), era)
+    let result = queries_v16::get_block_epoch_number(client, era)
         .await
         .unwrap();
 
     info!("result: {:?}", result);
 
-    client.statequery().send_release().await.unwrap();
+    client.send_release().await.unwrap();
 }
 
 async fn do_chainsync(client: &mut NodeClient) {
@@ -63,7 +54,9 @@ async fn do_chainsync(client: &mut NodeClient) {
     }
 }
 
-const SOCKET_PATH: &str = "/Users/santiago_ho/.dmtr/tmp/starters-28e75e/mainnet-stable.socket";
+// change the following to match the Cardano node socket in your local
+// environment
+const SOCKET_PATH: &str = "/tmp/node.socket";
 
 #[cfg(target_family = "unix")]
 #[tokio::main]
@@ -77,7 +70,7 @@ async fn main() {
 
     // we connect to the unix socket of the local node. Make sure you have the right
     // path for your environment
-    let mut client = NodeClient::connect(SOCKET_PATH, MAINNET_MAGIC)
+    let mut client = NodeClient::connect(SOCKET_PATH, PRE_PRODUCTION_MAGIC)
         .await
         .unwrap();
 
diff --git a/pallas-network/src/miniprotocols/localstate/client.rs b/pallas-network/src/miniprotocols/localstate/client.rs
index 37860f56..34438d86 100644
--- a/pallas-network/src/miniprotocols/localstate/client.rs
+++ b/pallas-network/src/miniprotocols/localstate/client.rs
@@ -190,7 +190,7 @@ impl GenericClient {
         }
     }
 
-    pub async fn query_generic(&mut self, request: AnyCbor) -> Result<AnyCbor, ClientError> {
+    pub async fn query_any(&mut self, request: AnyCbor) -> Result<AnyCbor, ClientError> {
         self.send_query(request).await?;
         self.recv_while_querying().await
     }
@@ -201,10 +201,7 @@ impl GenericClient {
         for<'b> R: pallas_codec::minicbor::Decode<'b, ()>,
     {
         let request = AnyCbor::from_encode(request);
-        self.send_query(request).await?;
-
-        let response = self.recv_while_querying().await?;
-
+        let response = self.query_any(request).await?;
         response.into_decode().map_err(ClientError::InvalidCbor)
     }
 }
diff --git a/pallas-network/src/miniprotocols/localstate/protocol.rs b/pallas-network/src/miniprotocols/localstate/protocol.rs
index f679703f..1d162c27 100644
--- a/pallas-network/src/miniprotocols/localstate/protocol.rs
+++ b/pallas-network/src/miniprotocols/localstate/protocol.rs
@@ -1,4 +1,3 @@
-use std::convert::Into;
 use std::fmt::Debug;
 
 use pallas_codec::utils::AnyCbor;
diff --git a/pallas-network/src/miniprotocols/localstate/queries_v16/codec.rs b/pallas-network/src/miniprotocols/localstate/queries_v16/codec.rs
index cfc1d702..5e731414 100644
--- a/pallas-network/src/miniprotocols/localstate/queries_v16/codec.rs
+++ b/pallas-network/src/miniprotocols/localstate/queries_v16/codec.rs
@@ -71,7 +71,7 @@ impl Encode<()> for BlockQuery {
                 e.array(1)?;
                 e.u16(14)?;
             }
-            BlockQuery::GetUTxOByTxIn(x) => {
+            BlockQuery::GetUTxOByTxIn(_) => {
                 e.array(2)?;
                 e.u16(15)?;
                 e.encode(2)?;
@@ -172,7 +172,7 @@ impl Encode<()> for HardForkQuery {
 }
 
 impl<'b> Decode<'b, ()> for HardForkQuery {
-    fn decode(d: &mut Decoder<'b>, ctx: &mut ()) -> Result<Self, decode::Error> {
+    fn decode(_d: &mut Decoder<'b>, _: &mut ()) -> Result<Self, decode::Error> {
         todo!()
     }
 }
@@ -197,7 +197,7 @@ impl Encode<()> for LedgerQuery {
 }
 
 impl<'b> Decode<'b, ()> for LedgerQuery {
-    fn decode(d: &mut Decoder<'b>, ctx: &mut ()) -> Result<Self, decode::Error> {
+    fn decode(_d: &mut Decoder<'b>, _: &mut ()) -> Result<Self, decode::Error> {
         todo!()
     }
 }