fix: rebase conflicts and errors message

src/core/debt_token.cairo

@@ -104,7 +104,7 @@ mod DebtToken {
 
         fn add_whitelist(ref self: ContractState, address: ContractAddress) {
             self.ownable.assert_only_owner();
-            assert(address.is_non_zero(), CommunErrors::CommunErrors__AddressZero);
+            assert(address.is_non_zero(), CommunErrors::AddressZero);
             assert(!self.is_whitelisted(address), Errors::AlreadyWhitelisted);
             self.whitelisted_contracts.write(address, true);
             self.emit(WhitelistChanged { address: address, is_whitelisted: true });
@@ -127,7 +127,7 @@ mod DebtToken {
         #[inline(always)]
         fn assert_caller_is_whitelisted_contract(self: @ContractState) {
             let caller = get_caller_address();
-            assert(self.is_whitelisted(caller), CommunErrors::CommunErrors__CallerNotAuthorized);
+            assert(self.is_whitelisted(caller), CommunErrors::CallerNotAuthorized);
         }
 
         #[inline(always)]
@@ -137,10 +137,7 @@ mod DebtToken {
                 .address_provider
                 .read()
                 .get_address(AddressesKey::borrower_operations);
-            assert(
-                caller == borrower_operations_manager,
-                CommunErrors::CommunErrors__CallerNotAuthorized
-            );
+            assert(caller == borrower_operations_manager, CommunErrors::CallerNotAuthorized);
         }
 
         #[inline(always)]
@@ -155,7 +152,7 @@ mod DebtToken {
                 caller == borrower_operations_manager
                     || caller == vessel_manager
                     || caller == stability_pool,
-                CommunErrors::CommunErrors__CallerNotAuthorized
+                CommunErrors::CallerNotAuthorized
             );
         }
 
@@ -164,7 +161,7 @@ mod DebtToken {
             let caller = get_caller_address();
             let address_provider = self.address_provider.read();
             let stability_pool = address_provider.get_address(AddressesKey::stability_pool);
-            assert(caller == stability_pool, CommunErrors::CommunErrors__CallerNotAuthorized);
+            assert(caller == stability_pool, CommunErrors::CallerNotAuthorized);
         }
 
         #[inline(always)]
@@ -175,7 +172,7 @@ mod DebtToken {
             let stability_pool = address_provider.get_address(AddressesKey::stability_pool);
             assert(
                 caller == vessel_manager || caller == stability_pool,
-                CommunErrors::CommunErrors__CallerNotAuthorized
+                CommunErrors::CallerNotAuthorized
             );
         }
     }

src/utils/errors.cairo

@@ -1,7 +1,7 @@
 mod CommunErrors {
     const AddressZero: felt252 = 'Address is zero';
     const CantBeZero: felt252 = 'Value is zero';
-    const OnlyTimelock: felt252 = 'Caller not Timelock';
-    const CallerNotAuthorized: felt252 = 'Caller not authorized';
+    const OnlyTimelock: felt252 = 'Caller is not Timelock';
+    const CallerNotAuthorized: felt252 = 'Caller is not authorized';
     const Invalid_amount: felt252 = 'Amount Invalid';
 }

tests/integration/core/admin_contract/add_new_collateral/test_add_new_collateral.cairo

@@ -23,7 +23,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, _) = setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_borrowing_fee/test_set_borrowing_fee.cairo

@@ -26,7 +26,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_ccr/test_set_ccr.cairo

@@ -26,7 +26,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_collateral_parameters/test_set_collateral_parameters.cairo

@@ -27,7 +27,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_is_active/test_set_is_active.cairo

@@ -23,7 +23,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_mcr/test_set_mcr.cairo

@@ -25,7 +25,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_min_net_debt/test_set_min_net_debt.cairo

@@ -25,7 +25,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_mint_cap/test_set_mint_cap.cairo

@@ -25,7 +25,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_percent_divisor/test_set_percent_divisor.cairo

@@ -25,7 +25,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_redemption_block_timestamp/test_set_redemption_block_timestamp.cairo

@@ -25,7 +25,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/admin_contract/set_redemption_fee_floor/test_set_redemption_fee_floor.cairo

@@ -25,7 +25,7 @@ fn given_setup_not_initialized_and_caller_is_not_owner_it_should_revert() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_setup_is_initialized_and_caller_is_not_timelock_it_should_revert() {
     let (admin_contract, collateral_address, _) = test_setup();
     admin_contract.set_setup_initialized();

tests/integration/core/price_feed/set_oracle/set_oracle.tree

@@ -1,7 +1,7 @@
 test_set_oracle.cairo
 ├── when set a new oracle and caller not owner
 │   └── it should revert
-├── when set an oracle that alreay exist and caller not timelock contract
+├── when set an oracle that alreay exist and Caller is not Timelock contract
 │   └── it should revert with TimelockOnlyError
 └── when caller is valid
     ├── when decimals is zero

tests/unit/core/address_provider/set_address/test_set_address.cairo

@@ -35,7 +35,7 @@ fn given_caller_is_owner_setting_new_address_zero_it_should_revert() {
 
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_caller_is_owner_and_key_already_has_an_address_it_should_revert() {
     let (address_provider, address_provider_address) = setup();
     address_provider
@@ -77,7 +77,7 @@ fn given_caller_is_owner_it_should_set_new_address() {
 }
 
 #[test]
-#[should_panic(expected: ('Caller not Timelock',))]
+#[should_panic(expected: ('Caller is not Timelock',))]
 fn given_caller_is_not_timelock_and_updating_address_of_key_it_should_revert() {
     let (address_provider, address_provider_address) = setup();
     address_provider