From 8b3fb45b92197472d119f07c9212b2803d411179 Mon Sep 17 00:00:00 2001 From: Pi Lanningham Date: Tue, 16 Apr 2024 09:27:19 -0400 Subject: [PATCH] Cargo fmt --- pallas-network/src/facades.rs | 10 ++++++---- .../src/miniprotocols/chainsync/client.rs | 7 ++++--- .../src/miniprotocols/handshake/client.rs | 2 +- .../src/miniprotocols/handshake/n2c.rs | 18 ++++++++---------- .../src/miniprotocols/handshake/protocol.rs | 4 +++- pallas-network/src/multiplexer.rs | 14 +++++++------- pallas-primitives/src/alonzo/model.rs | 16 ++++++++++++++++ 7 files changed, 45 insertions(+), 26 deletions(-) diff --git a/pallas-network/src/facades.rs b/pallas-network/src/facades.rs index 4dc0ef1d..31a57c79 100644 --- a/pallas-network/src/facades.rs +++ b/pallas-network/src/facades.rs @@ -4,6 +4,7 @@ use thiserror::Error; use tokio::task::JoinHandle; use tracing::{debug, error}; +use crate::miniprotocols::handshake::Confirmation; use crate::{ miniprotocols::{ blockfetch, chainsync, handshake, localstate, PROTOCOL_N2C_CHAIN_SYNC, @@ -11,7 +12,6 @@ use crate::{ }, multiplexer::{self, Bearer}, }; -use crate::miniprotocols::handshake::Confirmation; #[derive(Debug, Error)] pub enum Error { @@ -89,8 +89,7 @@ pub struct NodeClient { } impl NodeClient { - - #[cfg(not(target_os = "windows"))] + #[cfg(not(target_os = "windows"))] pub async fn connect(path: impl AsRef, magic: u64) -> Result { debug!("connecting"); @@ -128,7 +127,10 @@ impl NodeClient { } #[cfg(not(target_os = "windows"))] - pub async fn handshake_query(path: impl AsRef, magic: u64) -> Result { + pub async fn handshake_query( + path: impl AsRef, + magic: u64, + ) -> Result { debug!("connecting"); let bearer = Bearer::connect_unix(path) diff --git a/pallas-network/src/miniprotocols/chainsync/client.rs b/pallas-network/src/miniprotocols/chainsync/client.rs index dc24afa9..9d111f01 100644 --- a/pallas-network/src/miniprotocols/chainsync/client.rs +++ b/pallas-network/src/miniprotocols/chainsync/client.rs @@ -277,10 +277,11 @@ where } /// Either requests the next block, or waits for one to become available. - /// + /// /// # Errors - /// - /// Returns an error if the message cannot be sent, or if the inbound message is invalid + /// + /// Returns an error if the message cannot be sent, or if the inbound + /// message is invalid pub async fn request_or_await_next(&mut self) -> Result, Error> { if self.has_agency() { self.request_next().await diff --git a/pallas-network/src/miniprotocols/handshake/client.rs b/pallas-network/src/miniprotocols/handshake/client.rs index 4331d4fa..9fed8c37 100644 --- a/pallas-network/src/miniprotocols/handshake/client.rs +++ b/pallas-network/src/miniprotocols/handshake/client.rs @@ -1,5 +1,5 @@ -use std::fmt::Debug; use pallas_codec::Fragment; +use std::fmt::Debug; use std::marker::PhantomData; use tracing::debug; diff --git a/pallas-network/src/miniprotocols/handshake/n2c.rs b/pallas-network/src/miniprotocols/handshake/n2c.rs index 4a147358..16cac23b 100644 --- a/pallas-network/src/miniprotocols/handshake/n2c.rs +++ b/pallas-network/src/miniprotocols/handshake/n2c.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; -use pallas_codec::minicbor::{decode, Decode, Decoder, encode, Encode, Encoder}; use pallas_codec::minicbor::data::Type; +use pallas_codec::minicbor::{decode, encode, Decode, Decoder, Encode, Encoder}; use super::protocol::NetworkMagic; @@ -72,11 +72,9 @@ impl VersionTable { } pub fn v15_with_query(network_magic: u64) -> VersionTable { - let values = vec![ - (PROTOCOL_V15, VersionData(network_magic, Some(true))), - ] - .into_iter() - .collect::>(); + let values = vec![(PROTOCOL_V15, VersionData(network_magic, Some(true)))] + .into_iter() + .collect::>(); VersionTable { values } } @@ -92,7 +90,9 @@ impl Encode<()> for VersionData { _ctx: &mut (), ) -> Result<(), encode::Error> { match self.1 { - None => { e.u64(self.0)?; } + None => { + e.u64(self.0)?; + } Some(is_query) => { e.array(2)?; e.u64(self.0)?; @@ -117,9 +117,7 @@ impl<'b> Decode<'b, ()> for VersionData { let is_query = d.bool()?; Ok(Self(network_magic, Some(is_query))) } - _ => Err(decode::Error::message( - "unknown type for VersionData", - )), + _ => Err(decode::Error::message("unknown type for VersionData")), } } } diff --git a/pallas-network/src/miniprotocols/handshake/protocol.rs b/pallas-network/src/miniprotocols/handshake/protocol.rs index 4e6b33c2..ca7b90fa 100644 --- a/pallas-network/src/miniprotocols/handshake/protocol.rs +++ b/pallas-network/src/miniprotocols/handshake/protocol.rs @@ -56,7 +56,9 @@ where T: Debug + Clone + Decode<'b, ()>, { fn decode(d: &mut Decoder<'b>, _ctx: &mut ()) -> Result { - let len = d.map()?.ok_or(decode::Error::message("expected def-length map for versiontable"))?; + let len = d.map()?.ok_or(decode::Error::message( + "expected def-length map for versiontable", + ))?; let mut values = HashMap::new(); for _ in 0..len { diff --git a/pallas-network/src/multiplexer.rs b/pallas-network/src/multiplexer.rs index 4a293f50..12622855 100644 --- a/pallas-network/src/multiplexer.rs +++ b/pallas-network/src/multiplexer.rs @@ -12,7 +12,7 @@ use tokio::sync::mpsc::error::SendError; use tokio::time::Instant; use tracing::{debug, error, trace}; -#[cfg(not(target_os = "windows"))] +#[cfg(not(target_os = "windows"))] use tokio::net::UnixStream; const HEADER_LEN: usize = 8; @@ -62,7 +62,7 @@ pub struct Segment { #[cfg(target_os = "windows")] pub enum Bearer { - Tcp(TcpStream) + Tcp(TcpStream), } #[cfg(not(target_os = "windows"))] @@ -84,7 +84,7 @@ impl Bearer { Ok((Self::Tcp(stream), addr)) } - #[cfg(not(target_os = "windows"))] + #[cfg(not(target_os = "windows"))] pub async fn connect_unix(path: impl AsRef) -> Result { let stream = UnixStream::connect(path).await?; Ok(Self::Unix(stream)) @@ -93,7 +93,7 @@ impl Bearer { pub async fn readable(&self) -> tokio::io::Result<()> { match self { Bearer::Tcp(x) => x.readable().await, - #[cfg(not(target_os = "windows"))] + #[cfg(not(target_os = "windows"))] Bearer::Unix(x) => x.readable().await, } } @@ -101,7 +101,7 @@ impl Bearer { fn try_read(&mut self, buf: &mut [u8]) -> tokio::io::Result { match self { Bearer::Tcp(x) => x.try_read(buf), - #[cfg(not(target_os = "windows"))] + #[cfg(not(target_os = "windows"))] Bearer::Unix(x) => x.try_read(buf), } } @@ -109,7 +109,7 @@ impl Bearer { async fn write_all(&mut self, buf: &[u8]) -> tokio::io::Result<()> { match self { Bearer::Tcp(x) => x.write_all(buf).await, - #[cfg(not(target_os = "windows"))] + #[cfg(not(target_os = "windows"))] Bearer::Unix(x) => x.write_all(buf).await, } } @@ -117,7 +117,7 @@ impl Bearer { async fn flush(&mut self) -> tokio::io::Result<()> { match self { Bearer::Tcp(x) => x.flush().await, - #[cfg(not(target_os = "windows"))] + #[cfg(not(target_os = "windows"))] Bearer::Unix(x) => x.flush().await, } } diff --git a/pallas-primitives/src/alonzo/model.rs b/pallas-primitives/src/alonzo/model.rs index cba8858c..8b4af358 100644 --- a/pallas-primitives/src/alonzo/model.rs +++ b/pallas-primitives/src/alonzo/model.rs @@ -3,6 +3,7 @@ //! Handcrafted, idiomatic rust artifacts based on based on the [Alonzo CDDL](https://github.com/input-output-hk/cardano-ledger/blob/master/eras/alonzo/test-suite/cddl-files/alonzo.cddl) file in IOHK repo. use serde::{Deserialize, Serialize}; +use std::fmt::Display; use std::{fmt, ops::Deref}; use pallas_codec::minicbor::{data::Tag, Decode, Encode}; @@ -1001,6 +1002,21 @@ impl minicbor::encode::Encode for BigInt { } } +impl Display for BigInt { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + BigInt::Int(n) => n.fmt(f), + BigInt::BigUInt(bytes) | BigInt::BigNInt(bytes) => { + let mut s: String = String::new(); + let mut carry = 0; + for b in bytes.0.reverse() {} + s.insert_str(0, ""); + write!(f, "{}", s) + } + } + } +} + #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord, Clone)] pub enum PlutusData { Constr(Constr),