Added negative tests (#55)

* Added negative tests * Addressing review comments
Pi-Squared-Inc · Dec 20, 2024 · 072367b · 072367b
1 parent 3b0a7fa
commit 072367b
Show file tree

Hide file tree

Showing 3 changed files with 479 additions and 4 deletions.
diff --git a/pykwasm/src/pykwasm/call.py b/pykwasm/src/pykwasm/call.py
@@ -5,7 +5,7 @@
 from eth_account import Account
 from requests.exceptions import ConnectionError
 from web3 import Web3
-from web3.exceptions import BadFunctionCallOutput, Web3RPCError
+from web3.exceptions import BadFunctionCallOutput, ContractLogicError, Web3RPCError
 from web3.middleware import SignAndSendRawMiddlewareBuilder
 
 ABI_MAP = {
@@ -98,11 +98,13 @@ def run_method(w3, contract, sender, eth, method, params):
         else:
             tx_hash = func.transact({'from': sender.address, 'value': eth})
             result_or_receipt = w3.eth.wait_for_transaction_receipt(tx_hash)
-    except (ConnectionError, BadFunctionCallOutput, Web3RPCError) as e:
+    except (ConnectionError, ContractLogicError, BadFunctionCallOutput, Web3RPCError) as e:
         if isinstance(e, (ConnectionError, ConnectionRefusedError)):
             msg = f'Failed to connect to node: {e.message}'
         elif isinstance(e, BadFunctionCallOutput):
             msg = f'Could not interpret function output: {",".join(e.args)}'
+        elif isinstance(e, ContractLogicError):
+            msg = f'Contract logic error: {e.message}'
         else:
             msg = f'Node RPC encountered an error: {e.message}'
         print(msg, file=sys.stderr)

diff --git a/pykwasm/src/pykwasm/kdist/wasm-semantics/ulm-wasm.md b/pykwasm/src/pykwasm/kdist/wasm-semantics/ulm-wasm.md
@@ -337,7 +337,7 @@ These rules define various integration points between the ULM and our Wasm inter
             </ulmWasm>
             ...
         </generatedTop>
-    )  => #if OutVal ==K NO_OUTPUT #then EVMC_INTERNAL_ERROR #else Status #fi
+    )  => #if Status ==Int EVMC_SUCCESS andBool OutVal ==K NO_OUTPUT #then EVMC_INTERNAL_ERROR #else Status #fi
 ```
 
 Hooks implementation
@@ -629,7 +629,7 @@ Handle the actual hook calls.
 
     rule
         <instrs>
-            #fail(ulmBytes(BYTES:Bytes)) => #throwException(EVMC_FAILURE, Bytes2String(BYTES))
+            #fail(ulmBytes(BYTES:Bytes)) => #throwException(EVMC_REVERT, Bytes2String(BYTES))
             ...
         </instrs>