From fd548592bfc4915bfd29ee4fdff89484ef37e7ce Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Sat, 15 Aug 2020 21:58:15 -0700 Subject: [PATCH] chain: remove clippy::try_error annotation --- zebra-chain/src/block/block.rs | 4 ++-- zebra-chain/src/block/header.rs | 2 +- zebra-chain/src/lib.rs | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/zebra-chain/src/block/block.rs b/zebra-chain/src/block/block.rs index 89a077b8..d7dfb837 100644 --- a/zebra-chain/src/block/block.rs +++ b/zebra-chain/src/block/block.rs @@ -53,10 +53,10 @@ impl Block { .ok_or_else(|| "block has no transactions")?; let mut rest = self.transactions.iter().skip(1); if !first.is_coinbase() { - Err("first transaction must be coinbase")?; + return Err("first transaction must be coinbase".into()); } if rest.any(|tx| tx.contains_coinbase_input()) { - Err("coinbase input found in non-coinbase transaction")?; + return Err("coinbase input found in non-coinbase transaction".into()); } Ok(()) } diff --git a/zebra-chain/src/block/header.rs b/zebra-chain/src/block/header.rs index cd730115..f06bda6c 100644 --- a/zebra-chain/src/block/header.rs +++ b/zebra-chain/src/block/header.rs @@ -106,7 +106,7 @@ impl BlockHeader { if self.time <= two_hours_in_the_future { Ok(()) } else { - Err("block header time is more than 2 hours in the future")? + Err("block header time is more than 2 hours in the future".into()) } } } diff --git a/zebra-chain/src/lib.rs b/zebra-chain/src/lib.rs index 79fcc9b2..86bb0b15 100644 --- a/zebra-chain/src/lib.rs +++ b/zebra-chain/src/lib.rs @@ -6,7 +6,6 @@ #![doc(html_favicon_url = "https://www.zfnd.org/images/zebra-favicon-128.png")] #![doc(html_logo_url = "https://www.zfnd.org/images/zebra-icon.png")] #![doc(html_root_url = "https://doc.zebra.zfnd.org/zebra_chain")] -#![allow(clippy::try_err)] #![deny(missing_docs)] #[macro_use]