Merge branch 'mariari/remove-quantity' into next

anoma · Dec 18, 2024 · 74bed03 · 74bed03
2 parents 72c189f + 55bc8d5
commit 74bed03
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 61 deletions.
diff --git a/Anoma/Resource/Types.juvix b/Anoma/Resource/Types.juvix
@@ -15,25 +15,6 @@ KindEq : Eq Kind :=
     eq (a b : Kind) : Bool := anomaEncode a == anomaEncode b;
   };
 
---- A fixed-size data type encoding the quantity of a resource.
-type Quantity :=
-  mkQuantity@{
-    unQuantity : Nat;
-  };
-
-instance
-FromNaturalQuantityI : FromNatural Quantity := mkFromNatural mkQuantity;
-
-instance
-NaturalQuantityI : Natural Quantity :=
-  mkNatural@{
-    + : Quantity -> Quantity -> Quantity
-      | (mkQuantity a) (mkQuantity b) := mkQuantity (a Natural.+ b);
-
-    * : Quantity -> Quantity -> Quantity
-      | (mkQuantity a) (mkQuantity b) := mkQuantity (a Natural.* b);
-  };
-
 --- A fixed-size data type encoding the public commitment to the private nullifier key.
 type NullifierKeyCommitment :=
   mkNullifierKeyCommitment@{
@@ -113,12 +94,6 @@ Value-Ord : Ord Value;
 deriving instance
 Value-Eq : Eq Value;
 
-deriving instance
-Quantity-Ord : Ord Quantity;
-
-deriving instance
-Quantity-Eq : Eq Quantity;
-
 --- Implements the ;FixedSize; trait for ;NullifierKeyCommitment;.
 instance
 NullifierKeyCommitment-FixedSize : FixedSize NullifierKeyCommitment :=

diff --git a/Applib/Projection/TotalQuantity.juvix b/Applib/Projection/TotalQuantity.juvix
diff --git a/Applib/Resource/Traits.juvix b/Applib/Resource/Traits.juvix
@@ -11,7 +11,6 @@ module Applib.Resource.Traits;
 -- import Applib.Resource.Traits.NullifierKey open public;
 -- import Applib.Resource.Traits.Originator open public;
 -- import Applib.Resource.Traits.Owner open public;
-import Applib.Resource.Traits.Quantity open public;
 -- import Applib.Resource.Traits.Supply open public;
 -- import Applib.Resource.Traits.Transferability open public;
 

diff --git a/Applib/Resource/Traits/Quantity.juvix b/Applib/Resource/Traits/Quantity.juvix
diff --git a/Applib/Transaction/Errors.juvix b/Applib/Transaction/Errors.juvix
@@ -22,8 +22,8 @@ type InsufficientElementsError :=
 
 type InsufficientHasQuantityError :=
   mkInsufficientHasQuantityError@{
-    limit : Quantity;
-    actual : Quantity;
+    limit : Nat;
+    actual : Nat;
   };
 
 type InvalidLogicError :=
@@ -139,13 +139,11 @@ InsufficientHasQuantityError-Show : Show InsufficientHasQuantityError :=
         ++str "limit : "
         ++str (e
           |> InsufficientHasQuantityError.limit
-          |> Quantity.unQuantity
           |> Show.show)
         ++str ", "
         ++str "actual"
         ++str (e
           |> InsufficientHasQuantityError.actual
-          |> Quantity.unQuantity
           |> Show.show)
         ++str "}"};