feat: don't return from isCashierRoot and isCashierShard functions

cloudwalk · Oct 30, 2024 · 55b448c · 55b448c
1 parent 5e7ff5b
commit 55b448c
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 42 deletions.
diff --git a/contracts/Cashier.sol b/contracts/Cashier.sol
@@ -59,11 +59,11 @@ contract Cashier is
     /// @dev The mask of all bit flags that are used for the cash-out operations.
     uint256 private constant ALL_CASH_OUT_HOOK_FLAGS =
         (1 << uint256(HookIndex.CashOutRequestBefore)) +
-        (1 << uint256(HookIndex.CashOutRequestAfter)) +
-        (1 << uint256(HookIndex.CashOutConfirmationBefore)) +
-        (1 << uint256(HookIndex.CashOutConfirmationAfter)) +
-        (1 << uint256(HookIndex.CashOutReversalBefore)) +
-        (1 << uint256(HookIndex.CashOutReversalAfter));
+            (1 << uint256(HookIndex.CashOutRequestAfter)) +
+            (1 << uint256(HookIndex.CashOutConfirmationBefore)) +
+            (1 << uint256(HookIndex.CashOutConfirmationAfter)) +
+            (1 << uint256(HookIndex.CashOutReversalBefore)) +
+            (1 << uint256(HookIndex.CashOutReversalAfter));
 
     // ------------------ Initializers ---------------------------- //
 
@@ -638,11 +638,9 @@ contract Cashier is
     // ------------------ Pure functions -------------------------- //
 
     /**
-    * @inheritdoc ICashierPrimary
-    */
-    function isCashierRoot()  external pure returns (bool) {
-        return true;
-    }
+     * @inheritdoc ICashierPrimary
+     */
+    function isCashierRoot() external pure {}
 
     // ------------------ Internal functions ---------------------- //
 
@@ -763,13 +761,9 @@ contract Cashier is
         }
 
         bool success;
-        try ICashierShard(shard).isCashierShard() returns (bool result) {
-            success = result;
+        try ICashierShard(shard).isCashierShard() {
+
         } catch {
-            success = false;
-        }
-
-        if (!success) {
             revert Cashier_ContractNotShard();
         }
     }
@@ -784,8 +778,8 @@ contract Cashier is
         }
 
         bool success;
-        try ICashier(root).isCashierRoot() returns (bool result) {
-            success = result;
+        try ICashier(root).isCashierRoot() {
+            success = true;
         } catch {
             success = false;
         }

diff --git a/contracts/CashierShard.sol b/contracts/CashierShard.sol
@@ -284,11 +284,9 @@ contract CashierShard is CashierShardStorage, OwnableUpgradeable, UUPSUpgradeabl
     // ------------------ Pure functions -------------------------- //
 
     /**
-    * @inheritdoc ICashierShardPrimary
-    */
-    function isCashierShard() external pure returns (bool) {
-        return true;
-    }
+     * @inheritdoc ICashierShardPrimary
+     */
+    function isCashierShard() external pure {}
 
     // ------------------ Internal functions ---------------------- //
 
@@ -350,14 +348,7 @@ contract CashierShard is CashierShardStorage, OwnableUpgradeable, UUPSUpgradeabl
      * @param shard The cashier shard contract address.
      */
     function _validateShardContract(address shard) internal pure {
-        bool success;
-        try ICashierShard(shard).isCashierShard() returns (bool result) {
-            success = result;
-        } catch {
-            success = false;
-        }
-
-        if (!success) {
+        try ICashierShard(shard).isCashierShard() {} catch {
             revert CashierShard_ContractNotShard();
         }
     }

diff --git a/contracts/interfaces/ICashier.sol b/contracts/interfaces/ICashier.sol
@@ -403,9 +403,9 @@ interface ICashierPrimary is ICashierTypes {
     function underlyingToken() external view returns (address);
 
     /**
-      * @dev Determines whether the contract is the cashier root contract.
+     * @dev Determines whether the contract is the cashier root contract.
      */
-    function isCashierRoot() external pure returns (bool);
+    function isCashierRoot() external pure;
 }
 
 /**

diff --git a/contracts/interfaces/ICashierShard.sol b/contracts/interfaces/ICashierShard.sol
@@ -173,9 +173,9 @@ interface ICashierShardPrimary is ICashierTypes {
     function getCashOuts(bytes32[] memory txIds) external view returns (CashOutOperation[] memory operations);
 
     /**
-      * @dev Determines whether the contract is the cashier shard contract.
+     * @dev Determines whether the contract is the cashier shard contract.
      */
-    function isCashierShard() external pure returns (bool);
+    function isCashierShard() external pure;
 }
 
 /**

diff --git a/contracts/mocks/CashierShardMock.sol b/contracts/mocks/CashierShardMock.sol
@@ -37,7 +37,5 @@ contract CashierShardMock is ICashierTypes {
     /**
      * @dev Simulates real CashierShard contract.
      */
-    function isCashierShard() external pure returns (bool) {
-        return true;
-    }
+    function isCashierShard() external pure {}
 }
diff --git a/test/CashierSharded.test.ts b/test/CashierSharded.test.ts
@@ -2410,16 +2410,16 @@ describe("Contracts 'Cashier' and `CashierShard`", async () => {
   });
 
   describe("Function 'isCashierRoot()'", async () => {
-    it("Returns expected value", async () => {
+    it("Executes as expected", async () => {
       const { cashierRoot } = await setUpFixture(deployAndConfigureContracts);
-      expect(await cashierRoot.isCashierRoot()).to.equal(true);
+      await expect(cashierRoot.isCashierRoot()).to.not.be.reverted;
     });
   });
 
   describe("Function 'isCashierShard()'", async () => {
-    it("Returns expected value", async () => {
+    it("Executes as expected", async () => {
       const { cashierShards } = await setUpFixture(deployAndConfigureContracts);
-      expect(await cashierShards[0].isCashierShard()).to.equal(true);
+      await expect(cashierShards[0].isCashierShard()).to.not.be.reverted;
     });
   });