Skip to content

Commit e0e6584

Browse files
committed
merge
2 parents 8e0797d + 6ff1e87 commit e0e6584

30 files changed

+736
-210
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
strategy:
4444
fail-fast: false
4545
matrix:
46-
type: ["ethereum_truffle", "ethereum_bench", "examples", "ethereum", "ethereum_vm", "native", "other"] # "wasm", "wasm_sym",
46+
type: ["ethereum_truffle", "ethereum_bench", "examples", "ethereum", "ethereum_vm", "native", "other", "wasm", "wasm_sym"]
4747
steps:
4848
- uses: actions/checkout@v1
4949
- name: Set up Python 3.6

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ nosetests.xml
4545
coverage.xml
4646
*,cover
4747
.hypothesis/
48+
mcore_*
4849

4950
# Translations
5051
*.mo

examples/evm/asm_to_smtlib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def send_funds(self, address, recipient, value):
117117
callbacks = Callbacks()
118118

119119
# evm = world.current_vm
120-
evm = EVM(constraints, 0x41424344454647484950, data, caller, value, code, world=world, gas=1000000)
120+
evm = EVM(0x41424344454647484950, data, caller, value, code, world=world, gas=1000000)
121121
evm.subscribe("will_execute_instruction", callbacks.will_execute_instruction)
122122

123123
print("CODE:")

manticore/core/manticore.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
description="The seed to use when randomly selecting states",
6060
)
6161

62+
6263
class ManticoreBase(Eventful):
6364
_published_events = {"solve"}
6465

manticore/core/smtlib/constraints.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ def __enter__(self) -> "ConstraintSet":
8282
return self._child
8383

8484
def __exit__(self, ty, value, traceback) -> None:
85+
assert self._child is not None
8586
self._child._parent = None
8687
self._child = None
8788

0 commit comments

Comments
 (0)