refactor(contracts & test): rm try catch within checkHashWithThreshol…

…dFromAdapters & _getThresholdHash
gnosis · Feb 27, 2024 · 2362a45 · 2362a45
1 parent d1a057d
commit 2362a45
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/packages/evm/contracts/Hashi.sol b/packages/evm/contracts/Hashi.sol
@@ -49,9 +49,7 @@ contract Hashi is IHashi {
 
         bytes32[] memory hashes = new bytes32[](adapters.length);
         for (uint256 i = 0; i < adapters.length; ) {
-            try adapters[i].getHash(domain, id) returns (bytes32 hash) {
-                hashes[i] = hash;
-            } catch {} // solhint-disable no-empty-blocks
+            hashes[i] = adapters[i].getHash(domain, id);
             unchecked {
                 ++i;
             }

diff --git a/packages/evm/contracts/ownable/ShuSo.sol b/packages/evm/contracts/ownable/ShuSo.sol
@@ -158,9 +158,7 @@ abstract contract ShuSo is IShuSho, OwnableUpgradeable {
 
         bytes32[] memory hashes = new bytes32[](adapters.length);
         for (uint256 i = 0; i < adapters.length; i++) {
-            try adapters[i].getHash(domain, id) returns (bytes32 currentHash) {
-                hashes[i] = currentHash;
-            } catch {} // solhint-disable no-empty-blocks
+            hashes[i] = adapters[i].getHash(domain, id);
         }
 
         for (uint256 i = 0; i < hashes.length; i++) {

diff --git a/packages/evm/test/05_Yaru.spec.ts b/packages/evm/test/05_Yaru.spec.ts
@@ -98,7 +98,7 @@ describe("Yaru", () => {
         pingPong1.address,
         "0x01",
         [reporter1.address, reporter2.address, reporter3.address],
-        [adapter1.address, adapter2.address, reporter3.address],
+        [adapter1.address, adapter2.address, adapter3.address],
       )
       const [message] = Message.fromReceipt(await tx.wait(1))
       const hash = await yaho.calculateMessageHash(message.serialize())