From 3c38a0ec110ddf0281b4e1edcb388c739785d99d Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Tue, 1 Aug 2023 00:47:36 -0400 Subject: [PATCH] cargo +nightly fmt --- coins/monero/src/wallet/seed/polyseed.rs | 6 ++-- coordinator/src/main.rs | 2 +- coordinator/tributary/src/block.rs | 8 ++--- coordinator/tributary/src/lib.rs | 6 ++-- coordinator/tributary/src/provided.rs | 4 +-- message-queue/src/main.rs | 4 ++- processor/src/main.rs | 3 +- substrate/client/src/serai/mod.rs | 36 ++++++++++------------ substrate/validator-sets/pallet/src/lib.rs | 4 +-- tests/reproducible-runtime/src/lib.rs | 7 +++-- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/coins/monero/src/wallet/seed/polyseed.rs b/coins/monero/src/wallet/seed/polyseed.rs index c442f974..4b38fd83 100644 --- a/coins/monero/src/wallet/seed/polyseed.rs +++ b/coins/monero/src/wallet/seed/polyseed.rs @@ -306,11 +306,13 @@ impl Polyseed { check_if_matches( lang.has_prefix, lang.words.iter().map(|lang_word| ascii(lang_word)), - &ascii(word) + &ascii(word), ) } else { check_if_matches(lang.has_prefix, lang.words.iter(), word) - }) else { continue 'language; }; + }) else { + continue 'language; + }; // WordList asserts the word list length is less than u16::MAX poly[i] = u16::try_from(coeff).expect("coeff exceeded u16"); diff --git a/coordinator/src/main.rs b/coordinator/src/main.rs index c4f3643d..6724ed62 100644 --- a/coordinator/src/main.rs +++ b/coordinator/src/main.rs @@ -681,7 +681,7 @@ async fn main() { let Ok(serai) = Serai::new("ws://127.0.0.1:9944").await else { log::error!("couldn't connect to the Serai node"); sleep(Duration::from_secs(5)).await; - continue + continue; }; return serai; } diff --git a/coordinator/tributary/src/block.rs b/coordinator/tributary/src/block.rs index 321566ab..64a398ab 100644 --- a/coordinator/tributary/src/block.rs +++ b/coordinator/tributary/src/block.rs @@ -171,10 +171,10 @@ impl Block { Err(BlockError::ProvidedAfterNonProvided)?; } - let Some(local) = - locally_provided.get_mut(order).and_then(|deque| deque.pop_front()) else { - Err(BlockError::NonLocalProvided(txs.pop().unwrap()))? - }; + let Some(local) = locally_provided.get_mut(order).and_then(|deque| deque.pop_front()) + else { + Err(BlockError::NonLocalProvided(txs.pop().unwrap()))? + }; if tx != &local { Err(BlockError::DistinctProvided)?; } diff --git a/coordinator/tributary/src/lib.rs b/coordinator/tributary/src/lib.rs index 49a0c034..bf5b3f79 100644 --- a/coordinator/tributary/src/lib.rs +++ b/coordinator/tributary/src/lib.rs @@ -229,9 +229,9 @@ impl Tributary { } Some(&TENDERMINT_MESSAGE) => { - let Ok(msg) = SignedMessageFor::>::decode::<&[u8]>( - &mut &msg[1 ..] - ) else { + let Ok(msg) = + SignedMessageFor::>::decode::<&[u8]>(&mut &msg[1 ..]) + else { log::error!("received invalid tendermint message"); return false; }; diff --git a/coordinator/tributary/src/provided.rs b/coordinator/tributary/src/provided.rs index 84e8647f..29172ca6 100644 --- a/coordinator/tributary/src/provided.rs +++ b/coordinator/tributary/src/provided.rs @@ -63,9 +63,7 @@ impl ProvidedTransactions { /// Provide a transaction for inclusion in a block. pub(crate) fn provide(&mut self, tx: T) -> Result<(), ProvidedError> { - let TransactionKind::Provided(order) = tx.kind() else { - Err(ProvidedError::NotProvided)? - }; + let TransactionKind::Provided(order) = tx.kind() else { Err(ProvidedError::NotProvided)? }; match verify_transaction(&tx, self.genesis, &mut HashMap::new()) { Ok(()) => {} diff --git a/message-queue/src/main.rs b/message-queue/src/main.rs index 4dc5ad2f..d1544572 100644 --- a/message-queue/src/main.rs +++ b/message-queue/src/main.rs @@ -140,7 +140,9 @@ async fn main() { NetworkId::Bitcoin => "BITCOIN_KEY", NetworkId::Ethereum => "ETHEREUM_KEY", NetworkId::Monero => "MONERO_KEY", - }) else { continue }; + }) else { + continue; + }; register_service(Service::Processor(network), key); } diff --git a/processor/src/main.rs b/processor/src/main.rs index bd6ef0eb..e78fc9ff 100644 --- a/processor/src/main.rs +++ b/processor/src/main.rs @@ -528,7 +528,8 @@ async fn boot( info!("reloading plan {}: {:?}", hex::encode(id), plan); let (Some((tx, eventuality)), _) = - prepare_send(network, signer.keys(), block_number, fee, plan).await else { + prepare_send(network, signer.keys(), block_number, fee, plan).await + else { panic!("previously created transaction is no longer being created") }; diff --git a/substrate/client/src/serai/mod.rs b/substrate/client/src/serai/mod.rs index 3ba15d92..942f1bda 100644 --- a/substrate/client/src/serai/mod.rs +++ b/substrate/client/src/serai/mod.rs @@ -206,9 +206,10 @@ impl Serai { } let Some(finalized) = - self.0.rpc().header(Some(finalized)).await.map_err(SeraiError::RpcError)? else { - return Ok(None); - }; + self.0.rpc().header(Some(finalized)).await.map_err(SeraiError::RpcError)? + else { + return Ok(None); + }; // If the finalized block has a lower number, this block can't be finalized if finalized.number() < header.number() { @@ -220,24 +221,20 @@ impl Serai { // chain // If that hash is this hash, this block is finalized let Some(hash) = - self - .0 - .rpc() - .block_hash(Some(header.number().into())) - .await - .map_err(SeraiError::RpcError)? else { - // This is an error since there is a block at this index - Err(SeraiError::InvalidNode)? - }; + self.0.rpc().block_hash(Some(header.number().into())).await.map_err(SeraiError::RpcError)? + else { + // This is an error since there is a block at this index + Err(SeraiError::InvalidNode)? + }; Ok(Some(header.hash() == hash)) } pub async fn get_block(&self, hash: [u8; 32]) -> Result, SeraiError> { - let Some(res) = - self.0.rpc().block(Some(hash.into())).await.map_err(SeraiError::RpcError)? else { - return Ok(None); - }; + let Some(res) = self.0.rpc().block(Some(hash.into())).await.map_err(SeraiError::RpcError)? + else { + return Ok(None); + }; // Only return finalized blocks if self.is_finalized(&res.block.header).await? != Some(true) { @@ -254,9 +251,10 @@ impl Serai { // In practice, the block is likely more useful than the header pub async fn get_block_by_number(&self, number: u64) -> Result, SeraiError> { let Some(hash) = - self.0.rpc().block_hash(Some(number.into())).await.map_err(SeraiError::RpcError)? else { - return Ok(None); - }; + self.0.rpc().block_hash(Some(number.into())).await.map_err(SeraiError::RpcError)? + else { + return Ok(None); + }; self.get_block(hash.into()).await } diff --git a/substrate/validator-sets/pallet/src/lib.rs b/substrate/validator-sets/pallet/src/lib.rs index 799dbb5b..d8ed0060 100644 --- a/substrate/validator-sets/pallet/src/lib.rs +++ b/substrate/validator-sets/pallet/src/lib.rs @@ -120,9 +120,7 @@ pub mod pallet { Err(Error::AlreadyGeneratedKeys)? } - let Some(musig_key) = MuSigKeys::::get(set) else { - Err(Error::NonExistentValidatorSet)? - }; + let Some(musig_key) = MuSigKeys::::get(set) else { Err(Error::NonExistentValidatorSet)? }; if !musig_key.verify(&set_keys_message(&set, key_pair), signature) { Err(Error::BadSignature)?; } diff --git a/tests/reproducible-runtime/src/lib.rs b/tests/reproducible-runtime/src/lib.rs index 994cdce4..24278fb5 100644 --- a/tests/reproducible-runtime/src/lib.rs +++ b/tests/reproducible-runtime/src/lib.rs @@ -66,9 +66,10 @@ pub fn reproducibly_builds() { let logs = Command::new("docker").arg("logs").arg(container).output().unwrap(); let Some(last_log) = - std::str::from_utf8(&logs.stdout).expect("output wasn't utf-8").lines().last() else { - continue 'runner; - }; + std::str::from_utf8(&logs.stdout).expect("output wasn't utf-8").lines().last() + else { + continue 'runner; + }; let split = last_log.split("Runtime hash: ").collect::>(); if split.len() == 2 {