Fix fmt & lint

1
FindoraNetwork · Feb 9, 2022 · 4caa9ab · 4caa9ab
1 parent 1a661d4
commit 4caa9ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/components/finutils/src/txn_builder/mod.rs b/src/components/finutils/src/txn_builder/mod.rs
@@ -51,7 +51,7 @@ use {
     zei::anon_xfr::structs::AXfrBody,
     zei::{
         anon_xfr::{
-            abar_to_bar::{gen_abar_to_bar_note},
+            abar_to_bar::gen_abar_to_bar_note,
             bar_to_abar::gen_bar_to_abar_body,
             gen_anon_xfr_body,
             keys::{AXfrKeyPair, AXfrPubKey},
@@ -531,7 +531,7 @@ impl TransactionBuilder {
             &input,
             &input_keypair,
             bar_pub_key,
-            asset_record_type
+            asset_record_type,
         )
         .c(d!())?;
 

diff --git a/src/ledger/src/data_model/effects.rs b/src/ledger/src/data_model/effects.rs
@@ -596,7 +596,7 @@ impl TxnEffect {
         self.abar_conv_inputs.push(body.clone());
         self.txos.push(Some(TxOutput {
             id: None,
-            record: body.output.clone(),
+            record: body.output,
             lien: None,
         }));
 

diff --git a/src/ledger/src/data_model/mod.rs b/src/ledger/src/data_model/mod.rs
@@ -44,7 +44,6 @@ use {
         result::Result as StdResult,
     },
     unicode_normalization::UnicodeNormalization,
-    zei::xfr::asset_record::AssetRecordType::NonConfidentialAmount_NonConfidentialAssetType,
     zei::{
         anon_xfr::{
             bar_to_abar::{BarToAbarBody, BarToAbarNote},
@@ -1776,6 +1775,7 @@ impl Transaction {
         self.check_fee() && !self.is_coinbase_tx()
     }
 
+    #[allow(clippy::if_same_then_else)]
     /// A simple fee checker
     ///
     /// The check logic is as follows:
@@ -1817,14 +1817,8 @@ impl Transaction {
                     }
                 } else if let Operation::TransferAnonAsset(_) = ops {
                     return true;
-                } else if let Operation::BarToAbar(ref x) = ops {
-                    if x.note.body.input.get_record_type()
-                        == NonConfidentialAmount_NonConfidentialAssetType
-                        && x.note.body.input.asset_type
-                            == XfrAssetType::NonConfidential(ASSET_TYPE_FRA)
-                    {
-                        return true;
-                    }
+                } else if let Operation::BarToAbar(_) = ops {
+                    return true;
                 } else if let Operation::AbarToBar(_) = ops {
                     return true;
                 } else if matches!(ops, Operation::UpdateValidator(_)) {