Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: improve test case inputs in selector table fuzz #3625

Merged
merged 3 commits into from
Sep 28, 2023
Merged

fix: improve test case inputs in selector table fuzz #3625

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb5b771
fix: improve entropy in selector table fuzz
charles-cooper Sep 26, 2023
52ef3ed
remove bad arg
charles-cooper Sep 26, 2023
f8e1cff
switch to `@composite`
charles-cooper Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions tests/parser/test_selector_table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ def test_dense_jumptable_bucket_size(n_methods, seed):
@pytest.mark.parametrize("max_calldata_bytes", [255, 256, 65336])
@settings(max_examples=5, deadline=None)
@given(
seed=st.integers(min_value=0, max_value=2**64 - 1),
max_default_args=st.integers(min_value=0, max_value=4),
default_fn_mutability=st.sampled_from(["", "@pure", "@view", "@nonpayable", "@payable"]),
)
Expand All @@ -499,13 +498,13 @@ def test_selector_table_fuzz(
assert_tx_failed,
get_logs,
):
def abi_sig(calldata_words, i, n_default_args):
def abi_sig(seed, calldata_words, i, n_default_args):
args = [] if not calldata_words else [f"uint256[{calldata_words}]"]
args.extend(["uint256"] * n_default_args)
argstr = ",".join(args)
return f"foo{seed + i}({argstr})"

def generate_func_def(mutability, calldata_words, i, n_default_args):
def generate_func_def(seed, mutability, calldata_words, i, n_default_args):
arglist = [] if not calldata_words else [f"x: uint256[{calldata_words}]"]
for j in range(n_default_args):
arglist.append(f"x{j}: uint256 = 0")
Expand All @@ -523,7 +522,11 @@ def foo{seed + i}({args}) -> uint256:
@given(
methods=st.lists(
st.tuples(
# seed:
st.integers(min_value=0, max_value=2**64 - 1),
# mutability:
st.sampled_from(["@pure", "@view", "@nonpayable", "@payable"]),
# n calldata words:
st.integers(min_value=0, max_value=max_calldata_bytes // 32),
# n bytes to strip from calldata
st.integers(min_value=1, max_value=4),
Expand All @@ -537,7 +540,8 @@ def foo{seed + i}({args}) -> uint256:
@settings(max_examples=25)
def _test(methods):
func_defs = "\n".join(
generate_func_def(m, s, i, d) for i, (m, s, _, d) in enumerate(methods)
generate_func_def(seed, mutability, calldata_words, i, n_default_args)
for i, (seed, mutability, calldata_words, _, n_default_args) in enumerate(methods)
)

if default_fn_mutability == "":
Expand Down Expand Up @@ -571,7 +575,9 @@ def __default__():

c = get_contract(code, override_opt_level=opt_level)

for i, (mutability, n_calldata_words, n_strip_bytes, n_default_args) in enumerate(methods):
for i, (seed, mutability, n_calldata_words, n_strip_bytes, n_default_args) in enumerate(
methods
):
funcname = f"foo{seed + i}"
func = getattr(c, funcname)

Expand All @@ -582,7 +588,7 @@ def __default__():
# check the function returns as expected
assert func(*args) == i

method_id = utils.method_id(abi_sig(n_calldata_words, i, j))
method_id = utils.method_id(abi_sig(seed, n_calldata_words, i, j))

argsdata = b"\x00" * (n_calldata_words * 32 + j * 32)

Expand Down