Refactor Mint module to remove decrease_reserved_value method

Carbonable · Mar 18, 2024 · 28aac30 · 28aac30
1 parent 92e19ec
commit 28aac30
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 26 deletions.
diff --git a/src/components/mint/interface.cairo b/src/components/mint/interface.cairo
@@ -29,7 +29,6 @@ trait IMint<TContractState> {
     fn set_max_value(ref self: TContractState, max_value: u256);
     fn set_unit_price(ref self: TContractState, unit_price: u256);
     fn update_reserved_value(ref self: TContractState, value: u256);
-    fn decrease_reserved_value(ref self: TContractState, value: u256);
     fn airdrop(ref self: TContractState, to: ContractAddress, value: u256);
     fn withdraw(ref self: TContractState);
     fn transfer(

diff --git a/src/components/mint/module.cairo b/src/components/mint/module.cairo
@@ -264,7 +264,7 @@ mod Mint {
 
         fn update_reserved_value(ref self: ContractState, value: u256) {
             // [Check] Value not null
-            assert(value > 0, 'Invalid value');
+            assert(value >= 0, 'Invalid value');
             // [Check] Enough remaining value for the update value
             let max_value = self._mint_max_value.read();
             let total_value = self.get_total_value();
@@ -274,16 +274,6 @@ mod Mint {
             self._mint_reserved_value.write(value);
         }
 
-        fn decrease_reserved_value(ref self: ContractState, value: u256) {
-            // [Check] Value not null
-            assert(value > 0, 'Invalid value');
-            // [Check] Enough reserved value available
-            let reserved_value = self._mint_reserved_value.read();
-            assert(reserved_value >= value, 'Not enough reserved value');
-            // [Effect] Update reserved value
-            self._mint_reserved_value.write(reserved_value - value);
-        }
-
         fn airdrop(ref self: ContractState, to: ContractAddress, value: u256) {
             // [Check] Caller is not null
             let caller_address = get_caller_address();

diff --git a/src/contracts/minter.cairo b/src/contracts/minter.cairo
@@ -247,15 +247,6 @@ mod Minter {
             Mint::MintImpl::update_reserved_value(ref unsafe_state, value)
         }
 
-        fn decrease_reserved_value(ref self: ContractState, value: u256) {
-            // [Check] Only owner
-            let unsafe_state = Ownable::unsafe_new_contract_state();
-            Ownable::InternalImpl::assert_only_owner(@unsafe_state);
-            // [Effect] Decrease reserved value
-            let mut unsafe_state = Mint::unsafe_new_contract_state();
-            Mint::MintImpl::decrease_reserved_value(ref unsafe_state, value)
-        }
-
         fn airdrop(ref self: ContractState, to: ContractAddress, value: u256) {
             // [Check] Only owner
             let unsafe_state = Ownable::unsafe_new_contract_state();

diff --git a/src/tests/test_minter.cairo b/src/tests/test_minter.cairo
@@ -284,13 +284,13 @@ fn test_minter_airdrop() {
     let erc20 = IERC20Dispatcher { contract_address: contracts.erc20 };
     erc20.approve(contracts.minter, UNIT_PRICE * MAX_VALUE);
     minter.pre_buy(ALLOCATION, proof, 5, false);
-    // [Assert] Open public sale
-    set_contract_address(signers.owner);
-    minter.set_public_sale_open(true);
     // [Assert] Airdrop
+    set_contract_address(signers.owner);
     minter.airdrop(signers.anyone, 3);
-    // [Assert] Decrease reserve value
-    minter.decrease_reserved_value(1);
+    // [Assert] Open public sale
+    minter.set_public_sale_open(true);
+    assert(minter.is_public_sale_open(), 'Public sale should be open');
+    minter.update_reserved_value(0);
     // [Assert] Public buy
     set_contract_address(signers.anyone);
     minter.public_buy(1, false);