refactor: semi-revert validation error

tari-project · Dec 13, 2022 · 47fdf93 · 47fdf93
1 parent 774ab7a
commit 47fdf93
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/base_layer/core/src/transactions/aggregated_body.rs b/base_layer/core/src/transactions/aggregated_body.rs
@@ -45,24 +45,21 @@ use tari_crypto::{
 };
 use tari_script::ScriptContext;
 
-use crate::{
-    transactions::{
-        crypto_factories::CryptoFactories,
-        tari_amount::MicroTari,
-        transaction_components::{
-            transaction_output::batch_verify_range_proofs,
-            KernelFeatures,
-            KernelSum,
-            OutputType,
-            Transaction,
-            TransactionError,
-            TransactionInput,
-            TransactionKernel,
-            TransactionOutput,
-        },
-        weight::TransactionWeight,
+use crate::transactions::{
+    crypto_factories::CryptoFactories,
+    tari_amount::MicroTari,
+    transaction_components::{
+        transaction_output::batch_verify_range_proofs,
+        KernelFeatures,
+        KernelSum,
+        OutputType,
+        Transaction,
+        TransactionError,
+        TransactionInput,
+        TransactionKernel,
+        TransactionOutput,
     },
-    validation::helpers,
+    weight::TransactionWeight,
 };
 
 pub const LOG_TARGET: &str = "c::tx::aggregated_body";
@@ -330,7 +327,16 @@ impl AggregateBody {
 
     pub fn check_output_features(&self, max_coinbase_metadata_size: u32) -> Result<(), TransactionError> {
         for output in self.outputs() {
-            helpers::check_output_feature(output, max_coinbase_metadata_size)?;
+            if !output.is_coinbase() && !output.features.coinbase_extra.is_empty() {
+                return Err(TransactionError::NonCoinbaseHasOutputFeaturesCoinbaseExtra);
+            }
+
+            if output.is_coinbase() && output.features.coinbase_extra.len() as u32 > max_coinbase_metadata_size {
+                return Err(TransactionError::InvalidOutputFeaturesCoinbaseExtraSize {
+                    len: output.features.coinbase_extra.len(),
+                    max: max_coinbase_metadata_size,
+                });
+            }
         }
 
         Ok(())