From 4a2d2a359cd415d7b0d5907fdcdaa047a3e958f1 Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Wed, 27 May 2020 19:12:25 -0700 Subject: [PATCH] add cargo fmt to ci (#403) * add cargo fmt to ci * rebase on main * switch to stable Co-authored-by: Jane Lusby --- .github/workflows/main.yml | 15 +++++ zebra-chain/src/addresses/sapling.rs | 10 ++-- zebra-chain/src/addresses/sprout.rs | 10 ++-- zebra-chain/src/keys/sprout.rs | 10 ++-- zebra-chain/src/transaction/hash.rs | 7 ++- zebra-chain/src/transaction/joinsplit.rs | 20 +++---- zebra-chain/src/transaction/shielded_data.rs | 61 +++++++++----------- zebra-network/src/config.rs | 3 +- zebra-network/src/lib.rs | 2 +- zebra-network/src/peer/handshake.rs | 4 +- zebra-network/src/protocol/external/types.rs | 2 - 11 files changed, 73 insertions(+), 71 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d34cfc9c..6ac5bfde 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,3 +86,18 @@ jobs: uses: actions-rs/clippy@master # Next gen Clippy Action, unstable with: args: --all-features --all-targets + + fmt: + name: Rustfmt + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + - run: rustup component add rustfmt + - uses: actions-rs/cargo@v1 + with: + command: fmt + args: --all -- --check diff --git a/zebra-chain/src/addresses/sapling.rs b/zebra-chain/src/addresses/sapling.rs index b335f865..f6e9e0ae 100644 --- a/zebra-chain/src/addresses/sapling.rs +++ b/zebra-chain/src/addresses/sapling.rs @@ -98,12 +98,10 @@ impl Arbitrary for SaplingShieldedAddress { any::(), any::(), ) - .prop_map(|(network, diversifier, transmission_key)| { - Self { - network, - diversifier, - transmission_key, - } + .prop_map(|(network, diversifier, transmission_key)| Self { + network, + diversifier, + transmission_key, }) .boxed() } diff --git a/zebra-chain/src/addresses/sprout.rs b/zebra-chain/src/addresses/sprout.rs index 8e0ad4f6..62582025 100644 --- a/zebra-chain/src/addresses/sprout.rs +++ b/zebra-chain/src/addresses/sprout.rs @@ -119,12 +119,10 @@ impl Arbitrary for SproutShieldedAddress { array::uniform32(any::()), array::uniform32(any::()), ) - .prop_map(|(network, paying_key_bytes, transmission_key_bytes)| { - Self { - network, - paying_key: sprout::PayingKey(paying_key_bytes), - transmission_key: sprout::TransmissionKey::from(transmission_key_bytes), - } + .prop_map(|(network, paying_key_bytes, transmission_key_bytes)| Self { + network, + paying_key: sprout::PayingKey(paying_key_bytes), + transmission_key: sprout::TransmissionKey::from(transmission_key_bytes), }) .boxed() } diff --git a/zebra-chain/src/keys/sprout.rs b/zebra-chain/src/keys/sprout.rs index 737446fa..f1e1137a 100644 --- a/zebra-chain/src/keys/sprout.rs +++ b/zebra-chain/src/keys/sprout.rs @@ -297,12 +297,10 @@ impl Arbitrary for IncomingViewingKey { array::uniform32(any::()), array::uniform32(any::()), ) - .prop_map(|(network, paying_key_bytes, receiving_key_bytes)| { - Self { - network, - paying_key: PayingKey(paying_key_bytes), - receiving_key: ReceivingKey::from(receiving_key_bytes), - } + .prop_map(|(network, paying_key_bytes, receiving_key_bytes)| Self { + network, + paying_key: PayingKey(paying_key_bytes), + receiving_key: ReceivingKey::from(receiving_key_bytes), }) .boxed() } diff --git a/zebra-chain/src/transaction/hash.rs b/zebra-chain/src/transaction/hash.rs index 742363ec..e9e53630 100644 --- a/zebra-chain/src/transaction/hash.rs +++ b/zebra-chain/src/transaction/hash.rs @@ -39,7 +39,7 @@ impl fmt::Debug for TransactionHash { impl std::str::FromStr for TransactionHash { type Err = SerializationError; - + fn from_str(s: &str) -> Result { let mut bytes = [0; 32]; if hex::decode_to_slice(s, &mut bytes[..]).is_err() { @@ -74,7 +74,10 @@ mod tests { #[test] fn transactionhash_from_str() { - let hash:TransactionHash = "bf46b4b5030752fedac6f884976162bbfb29a9398f104a280b3e34d51b416631".parse().unwrap(); + let hash: TransactionHash = + "bf46b4b5030752fedac6f884976162bbfb29a9398f104a280b3e34d51b416631" + .parse() + .unwrap(); assert_eq!( format!("{:?}", hash), r#"TransactionHash("bf46b4b5030752fedac6f884976162bbfb29a9398f104a280b3e34d51b416631")"# diff --git a/zebra-chain/src/transaction/joinsplit.rs b/zebra-chain/src/transaction/joinsplit.rs index b4d13598..f3bfaf7a 100644 --- a/zebra-chain/src/transaction/joinsplit.rs +++ b/zebra-chain/src/transaction/joinsplit.rs @@ -159,17 +159,15 @@ impl Arbitrary for JoinSplitData

{ array::uniform32(any::()), vec(any::(), 64), ) - .prop_map(|(first, rest, pub_key_bytes, sig_bytes)| { - Self { - first, - rest, - pub_key: ed25519_zebra::PublicKeyBytes::from(pub_key_bytes), - sig: ed25519_zebra::Signature::from({ - let mut b = [0u8; 64]; - b.copy_from_slice(sig_bytes.as_slice()); - b - }), - } + .prop_map(|(first, rest, pub_key_bytes, sig_bytes)| Self { + first, + rest, + pub_key: ed25519_zebra::PublicKeyBytes::from(pub_key_bytes), + sig: ed25519_zebra::Signature::from({ + let mut b = [0u8; 64]; + b.copy_from_slice(sig_bytes.as_slice()); + b + }), }) .boxed() } diff --git a/zebra-chain/src/transaction/shielded_data.rs b/zebra-chain/src/transaction/shielded_data.rs index 6dbfbaaa..472c5ec5 100644 --- a/zebra-chain/src/transaction/shielded_data.rs +++ b/zebra-chain/src/transaction/shielded_data.rs @@ -46,19 +46,17 @@ impl Arbitrary for Spend { vec(any::(), 64), ) .prop_map( - |(cv_bytes, anchor, nullifier_bytes, rpk_bytes, proof, sig_bytes)| { - Self { - anchor, - cv: cv_bytes, - nullifier: nullifier_bytes, - rk: redjubjub::PublicKeyBytes::from(rpk_bytes), - zkproof: proof, - spend_auth_sig: redjubjub::Signature::from({ - let mut b = [0u8; 64]; - b.copy_from_slice(sig_bytes.as_slice()); - b - }), - } + |(cv_bytes, anchor, nullifier_bytes, rpk_bytes, proof, sig_bytes)| Self { + anchor, + cv: cv_bytes, + nullifier: nullifier_bytes, + rk: redjubjub::PublicKeyBytes::from(rpk_bytes), + zkproof: proof, + spend_auth_sig: redjubjub::Signature::from({ + let mut b = [0u8; 64]; + b.copy_from_slice(sig_bytes.as_slice()); + b + }), }, ) .boxed() @@ -108,16 +106,13 @@ impl Arbitrary for Output { any::(), ) .prop_map( - |(cv, cmu, ephemeral_key_bytes, enc_ciphertext, out_ciphertext, zkproof)| { - Self { - cv, - cmu, - ephemeral_key: jubjub::AffinePoint::from_bytes(ephemeral_key_bytes) - .unwrap(), - enc_ciphertext, - out_ciphertext, - zkproof, - } + |(cv, cmu, ephemeral_key_bytes, enc_ciphertext, out_ciphertext, zkproof)| Self { + cv, + cmu, + ephemeral_key: jubjub::AffinePoint::from_bytes(ephemeral_key_bytes).unwrap(), + enc_ciphertext, + out_ciphertext, + zkproof, }, ) .boxed() @@ -214,17 +209,15 @@ impl Arbitrary for ShieldedData { vec(any::(), 0..10), vec(any::(), 64), ) - .prop_map(|(first, rest_spends, rest_outputs, sig_bytes)| { - Self { - first, - rest_spends, - rest_outputs, - binding_sig: redjubjub::Signature::from({ - let mut b = [0u8; 64]; - b.copy_from_slice(sig_bytes.as_slice()); - b - }), - } + .prop_map(|(first, rest_spends, rest_outputs, sig_bytes)| Self { + first, + rest_spends, + rest_outputs, + binding_sig: redjubjub::Signature::from({ + let mut b = [0u8; 64]; + b.copy_from_slice(sig_bytes.as_slice()); + b + }), }) .boxed() } diff --git a/zebra-network/src/config.rs b/zebra-network/src/config.rs index d8e47ade..a213cdc8 100644 --- a/zebra-network/src/config.rs +++ b/zebra-network/src/config.rs @@ -1,7 +1,8 @@ use std::{ + collections::HashSet, net::{SocketAddr, ToSocketAddrs}, string::String, - time::Duration, collections::HashSet, + time::Duration, }; use zebra_chain::Network; diff --git a/zebra-network/src/lib.rs b/zebra-network/src/lib.rs index eed00512..f658b8d6 100644 --- a/zebra-network/src/lib.rs +++ b/zebra-network/src/lib.rs @@ -64,8 +64,8 @@ pub use crate::{ config::Config, peer_set::init, policies::{RetryErrors, RetryLimit}, - protocol::internal::{Request, Response}, protocol::external::codec::Builder, + protocol::internal::{Request, Response}, }; /// Types used in the definition of [`Request`] and [`Response`] messages. diff --git a/zebra-network/src/peer/handshake.rs b/zebra-network/src/peer/handshake.rs index f43f3017..7a421a11 100644 --- a/zebra-network/src/peer/handshake.rs +++ b/zebra-network/src/peer/handshake.rs @@ -181,8 +181,8 @@ where return Err(HandshakeError::UnexpectedMessage(Box::new(remote_msg))); } - // XXX in zcashd remote peer can only send one version message and - // we would disconnect here if it received a second one. Is it even possible + // XXX in zcashd remote peer can only send one version message and + // we would disconnect here if it received a second one. Is it even possible // for that to happen to us here? if remote_version < constants::MIN_VERSION { diff --git a/zebra-network/src/protocol/external/types.rs b/zebra-network/src/protocol/external/types.rs index 083a3f55..f9d2ce6a 100644 --- a/zebra-network/src/protocol/external/types.rs +++ b/zebra-network/src/protocol/external/types.rs @@ -77,8 +77,6 @@ pub struct Filter(pub Vec); #[cfg(test)] mod proptest { - - use proptest::prelude::*; use super::Magic;