From b5c653ed935e093aaffaf63233effab1941fad39 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 2 Sep 2020 14:26:26 +1000 Subject: [PATCH] Use ok_or for constants, rather than a redudant closure * Use ok_or for constants in zebra-network * Use ok_or for constants in zebra-consensus --- zebra-consensus/src/block/check.rs | 2 +- zebra-network/src/peer/handshake.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zebra-consensus/src/block/check.rs b/zebra-consensus/src/block/check.rs index aa4cfdb7f..29b55d038 100644 --- a/zebra-consensus/src/block/check.rs +++ b/zebra-consensus/src/block/check.rs @@ -15,7 +15,7 @@ pub fn is_coinbase_first(block: &Block) -> Result<(), Error> { let first = block .transactions .get(0) - .ok_or_else(|| "block has no transactions")?; + .ok_or("block has no transactions")?; let mut rest = block.transactions.iter().skip(1); if !first.is_coinbase() { return Err("first transaction must be coinbase".into()); diff --git a/zebra-network/src/peer/handshake.rs b/zebra-network/src/peer/handshake.rs index 10225f755..d6e184e6f 100644 --- a/zebra-network/src/peer/handshake.rs +++ b/zebra-network/src/peer/handshake.rs @@ -262,7 +262,7 @@ where let remote_msg = stream .next() .await - .ok_or_else(|| HandshakeError::ConnectionClosed)??; + .ok_or(HandshakeError::ConnectionClosed)??; // Check that we got a Version and destructure its fields into the local scope. debug!(?remote_msg, "got message from remote peer"); @@ -295,7 +295,7 @@ where let remote_msg = stream .next() .await - .ok_or_else(|| HandshakeError::ConnectionClosed)??; + .ok_or(HandshakeError::ConnectionClosed)??; if let Message::Verack = remote_msg { debug!("got verack from remote peer"); } else {