Update error msg change name of transfer interface and add check

carbonable-labs · Feb 6, 2024 · d76fede · d76fede
1 parent 47571a3
commit d76fede
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/components/absorber/carbon.cairo b/src/components/absorber/carbon.cairo
@@ -52,7 +52,7 @@ mod AbsorberComponent {
     }
 
     mod Errors {
-        const INVALID_ARRAY_LENGTH: felt252 = 'ERC1155: invalid array length';
+        const INVALID_ARRAY_LENGTH: felt252 = 'Absorber: invalid array length';
     }
 
     #[embeddable_as(AbsorberImpl)]
@@ -213,12 +213,7 @@ mod AbsorberComponent {
                     current_absorption = *absorptions_u256[index] - *absorptions_u256[index - 1];
                 }
 
-                cc_distribution
-                    .append(
-                        (current_absorption * share / MULT_ACCURATE_SHARE)
-                            .try_into()
-                            .expect('CC: Distribution overflow')
-                    );
+                cc_distribution.append((current_absorption * share / MULT_ACCURATE_SHARE));
                 index += 1;
             };
             cc_distribution.span()

diff --git a/src/components/minter/interface.cairo b/src/components/minter/interface.cairo
@@ -15,7 +15,7 @@ trait IMint<TContractState> {
     fn set_min_money_amount_per_tx(ref self: TContractState, min_money_amount_per_tx: u256);
     fn set_unit_price(ref self: TContractState, unit_price: u256);
     fn withdraw(ref self: TContractState);
-    fn transfer(
+    fn retrieve_amount(
         ref self: TContractState,
         token_address: ContractAddress,
         recipient: ContractAddress,

diff --git a/src/components/minter/mint.cairo b/src/components/minter/mint.cairo
@@ -81,7 +81,7 @@ mod MintComponent {
     }
 
     mod Errors {
-        const INVALID_ARRAY_LENGTH: felt252 = 'ERC1155: invalid array length';
+        const INVALID_ARRAY_LENGTH: felt252 = 'Mint: invalid array length';
     }
 
     #[embeddable_as(MintImpl)]
@@ -180,6 +180,12 @@ mod MintComponent {
         fn set_min_money_amount_per_tx(
             ref self: ComponentState<TContractState>, min_money_amount_per_tx: u256
         ) {
+            // [Check] Value in range
+            let max_money_amount_per_tx = self.Mint_max_money_amount.read();
+            assert(
+                max_money_amount_per_tx >= min_money_amount_per_tx,
+                'Invalid min money amount per tx'
+            );
             // [Effect] Store value
             self.Mint_min_money_amount_per_tx.write(min_money_amount_per_tx);
         }