Fixes suggested by @Erigara and @outoftardis

Signed-off-by: Daniil Polyakov <arjentix@gmail.com>

core/src/queue.rs

@@ -99,14 +99,13 @@ impl Queue {
         if tx.is_in_blockchain(&self.wsv) {
             return Err(Error::InBlockchain);
         }
-
-        if *tx.check_signature_condition(&self.wsv)? {
-            Ok(())
-        } else {
-            Err(Error::SignatureCondition(eyre!(
+        if !*tx.check_signature_condition(&self.wsv)? {
+            return Err(Error::SignatureCondition(eyre!(
                 "Signature condition check failed"
-            )))
+            )));
         }
+
+        Ok(())
     }
 
     /// Pushes transaction into queue.

core/src/sumeragi/fault.rs

@@ -3,6 +3,7 @@
 //! used in code.
 
 use iroha_config::sumeragi::Configuration;
+use iroha_primitives::must_use::MustUse;
 
 use super::*;
 
@@ -526,10 +527,7 @@ impl<G: GenesisNetworkTrait, F: FaultInjection> SumeragiWithFault<G, F> {
             "Forwarding tx to leader"
         );
         // Don't require leader to submit receipts and therefore create blocks if the tx is still waiting for more signatures.
-        if matches!(
-            tx.check_signature_condition(&self.wsv),
-            Ok(must_use_bool) if *must_use_bool
-        ) {
+        if let Ok(MustUse(true)) = tx.check_signature_condition(&self.wsv) {
             self.txs_awaiting_receipts.insert(tx.hash(), Instant::now());
         }
         let no_tx_receipt = view_change::Proof::no_transaction_receipt_received(

core/src/tx.rs

@@ -181,13 +181,8 @@ impl TransactionValidator {
         }
 
         let option_reason = match tx.check_signature_condition(&self.wsv) {
-            Ok(must_use_bool) => {
-                if *must_use_bool {
-                    None
-                } else {
-                    Some("Signature condition not satisfied.".to_owned())
-                }
-            }
+            Ok(MustUse(true)) => None,
+            Ok(MustUse(false)) => Some("Signature condition not satisfied.".to_owned()),
             Err(reason) => Some(reason.to_string()),
         }
         .map(|reason| UnsatisfiedSignatureConditionFail { reason })

data_model/src/lib.rs

@@ -399,7 +399,7 @@ impl IdentifiableBox {
 
 /// Create a [`Vec`] containing the arguments, which should satisfy `Into<Value>` bound.
 ///
-/// Syntax is the same as [`vec`](macro@vec)
+/// Syntax is the same as in [`vec`](macro@vec)
 #[macro_export]
 macro_rules! val_vec {
     () => { Vec::new() };

primitives/src/must_use.rs

@@ -44,23 +44,27 @@ use derive_more::{AsMut, AsRef, Constructor, Deref, Display};
     AsMut,
     Deref,
 )]
+#[repr(transparent)]
 #[must_use]
-pub struct MustUse<T>(T);
+pub struct MustUse<T>(pub T);
 
 impl<T> MustUse<T> {
     /// Get inner value
+    #[inline]
     pub fn into_inner(self) -> T {
         self.0
     }
 }
 
 impl<T> Borrow<T> for MustUse<T> {
+    #[inline]
     fn borrow(&self) -> &T {
         &self.0
     }
 }
 
 impl<T> BorrowMut<T> for MustUse<T> {
+    #[inline]
     fn borrow_mut(&mut self) -> &mut T {
         &mut self.0
     }