Fixing exception checks for fuzz bots

delvtech · Oct 16, 2024 · bd3e98a · bd3e98a
1 parent 9619581
commit bd3e98a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 42 deletions.
diff --git a/scripts/fork_fuzz_bots.py b/scripts/fork_fuzz_bots.py
@@ -72,37 +72,25 @@ def _fuzz_ignore_errors(exc: Exception) -> bool:
             return False
 
         # Insufficient liquidity error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('InsufficientLiquidity')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "InsufficientLiquidity()":
             return True
 
         # Circuit breaker triggered error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('CircuitBreakerTriggered')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "CircuitBreakerTriggered()":
             return True
 
         # DistributeExcessIdle error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('DistributeExcessIdleFailed')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "DistributeExcessIdleFailed()":
             return True
 
         # MinimumTransactionAmount error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('MinimumTransactionAmount')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "MinimumTransactionAmount()":
             return True
 
         # DecreasedPresentValueWhenAddingLiquidity error
         if (
             isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('DecreasedPresentValueWhenAddingLiquidity')" in exc.args
+            and exc.decoded_error == "DecreasedPresentValueWhenAddingLiquidity()"
         ):
             return True
 

diff --git a/scripts/local_fuzz_bots.py b/scripts/local_fuzz_bots.py
@@ -32,17 +32,11 @@ def _fuzz_ignore_logging_to_rollbar(exc: Exception) -> bool:
             return False
 
         # Insufficient liquidity error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('InsufficientLiquidity')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "InsufficientLiquidity()":
             return True
 
         # Circuit breaker triggered error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('CircuitBreakerTriggered')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "CircuitBreakerTriggered()":
             return True
 
     return False
@@ -77,37 +71,25 @@ def _fuzz_ignore_errors(exc: Exception) -> bool:
             return False
 
         # Insufficient liquidity error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('InsufficientLiquidity')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "InsufficientLiquidity()":
             return True
 
         # Circuit breaker triggered error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('CircuitBreakerTriggered')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "CircuitBreakerTriggered()":
             return True
 
         # DistributeExcessIdle error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('DistributeExcessIdleFailed')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "DistributeExcessIdleFailed()":
             return True
 
         # MinimumTransactionAmount error
-        if (
-            isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('MinimumTransactionAmount')" in exc.args
-        ):
+        if isinstance(orig_exception, ContractCustomError) and exc.decoded_error == "MinimumTransactionAmount()":
             return True
 
         # DecreasedPresentValueWhenAddingLiquidity error
         if (
             isinstance(orig_exception, ContractCustomError)
-            and "ContractCustomError('DecreasedPresentValueWhenAddingLiquidity')" in exc.args
+            and exc.decoded_error == "DecreasedPresentValueWhenAddingLiquidity()"
         ):
             return True