Renamed Magnitude type parameter to Value. Added is_zero function Val…

…ueSum. Corrected comments.
anoma · Aug 7, 2023 · 2f18560 · 2f18560
1 parent 4862ae7
commit 2f18560
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 123 deletions.
diff --git a/masp_primitives/src/transaction/builder.rs b/masp_primitives/src/transaction/builder.rs
@@ -18,7 +18,7 @@ use crate::{
     sapling::{prover::TxProver, Diversifier, Node, Note, PaymentAddress},
     transaction::{
         components::{
-            amount::{BalanceError, FromNt, I128Sum, U64Sum, ValueSum, MAX_MONEY},
+            amount::{BalanceError, I128Sum, U64Sum, ValueSum, MAX_MONEY},
             sapling::{
                 self,
                 builder::{SaplingBuilder, SaplingMetadata},
@@ -337,7 +337,7 @@ impl<P: consensus::Parameters, R: RngCore> Builder<P, R> {
         //
 
         // After fees are accounted for, the value balance of the transaction must be zero.
-        let balance_after_fees = self.value_balance()? - I128Sum::from(FromNt(fee));
+        let balance_after_fees = self.value_balance()? - I128Sum::from_sum(fee);
 
         if balance_after_fees != ValueSum::zero() {
             return Err(Error::InsufficientFunds(-balance_after_fees));
@@ -479,7 +479,7 @@ mod tests {
         merkle_tree::{CommitmentTree, IncrementalWitness},
         sapling::Rseed,
         transaction::{
-            components::amount::{FromNt, I128Sum, ValueSum, DEFAULT_FEE},
+            components::amount::{I128Sum, ValueSum, DEFAULT_FEE},
             sapling::builder as build_s,
             TransparentAddress,
         },
@@ -580,7 +580,9 @@ mod tests {
             let builder = Builder::new(TEST_NETWORK, tx_height);
             assert_eq!(
                 builder.mock_build(),
-                Err(Error::InsufficientFunds(FromNt(DEFAULT_FEE.clone()).into()))
+                Err(Error::InsufficientFunds(I128Sum::from_sum(
+                    DEFAULT_FEE.clone()
+                )))
             );
         }
 
@@ -599,7 +601,7 @@ mod tests {
                 builder.mock_build(),
                 Err(Error::InsufficientFunds(
                     I128Sum::from_pair(zec(), 50000).unwrap()
-                        + &I128Sum::from(FromNt(DEFAULT_FEE.clone()))
+                        + &I128Sum::from_sum(DEFAULT_FEE.clone())
                 ))
             );
         }
@@ -615,7 +617,7 @@ mod tests {
                 builder.mock_build(),
                 Err(Error::InsufficientFunds(
                     I128Sum::from_pair(zec(), 50000).unwrap()
-                        + &I128Sum::from(FromNt(DEFAULT_FEE.clone()))
+                        + &I128Sum::from_sum(DEFAULT_FEE.clone())
                 ))
             );
         }

diff --git a/masp_primitives/src/transaction/components.rs b/masp_primitives/src/transaction/components.rs
@@ -5,8 +5,7 @@ pub mod sapling;
 pub mod transparent;
 pub use self::{
     amount::{
-        FromNt, I128Sum, I16Sum, I32Sum, I64Sum, I8Sum, TryFromNt, U128Sum, U16Sum, U32Sum, U64Sum,
-        U8Sum, ValueSum,
+        I128Sum, I16Sum, I32Sum, I64Sum, I8Sum, U128Sum, U16Sum, U32Sum, U64Sum, U8Sum, ValueSum,
     },
     sapling::{ConvertDescription, OutputDescription, SpendDescription},
     transparent::{TxIn, TxOut},