Merge pull request #230 from DanielSchiavini/fix/revert

fix: nested reverts error strings

boa/contracts/base_evm_contract.py

@@ -102,7 +102,10 @@ def __str__(self):
         frame = self.stack_trace.last_frame
         if hasattr(frame, "vm_error"):
             err = frame.vm_error
-            err.args = (frame.pretty_vm_reason, *err.args[1:])
+            if not hasattr(err, "_boa_patched__"):
+                # avoid double patching when str() is called more than once
+                setattr(err, "_boa_patched__", True)
+                err.args = (frame.pretty_vm_reason, *err.args[1:])
         else:
             err = frame
         return f"{err}\n\n{self.stack_trace}"

boa/interpret.py

@@ -99,7 +99,7 @@ def func():
     return _disk_cache.caching_lookup(str((kwargs, source_code)), func)
 
 
-def load(filename: str, *args, **kwargs) -> _Contract:  # type: ignore
+def load(filename: str | Path, *args, **kwargs) -> _Contract:  # type: ignore
     name = filename
     # TODO: investigate if we can just put name in the signature
     if "name" in kwargs:
@@ -138,7 +138,7 @@ def loads_abi(json_str: str, *args, name: str = None, **kwargs) -> ABIContractFa
 def loads_partial(
     source_code: str,
     name: str = None,
-    filename: str = None,
+    filename: str | Path | None = None,
     dedent: bool = True,
     compiler_args: dict = None,
 ) -> VyperDeployer:

tests/unitary/test_reverts.py

@@ -156,10 +156,11 @@ def add():
     assert self.counter == 0
     """
     )
-    try:
-        assert c.add()
-    except BoaError as e:
-        assert "<storage: counter=1>" in str(e)
+    with pytest.raises(BoaError) as context:
+        c.add()
+
+    assert "<storage: counter=1>" in str(context.value)
+    assert str(context.value).startswith("Revert(b'')")
 
     assert 0 == c._storage.counter.get()
     assert 0 == c.counter()