Skip to content

Add new tests moved from execution-spec-tests #1129

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

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Add new tests moved from execution-spec-tests #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d4528e
Add more tests
hugo-dc Nov 27, 2024
39a56f8
Update tests
hugo-dc Dec 18, 2024
d860fbd
Merge tests dataloadn and EOF1_dataloadn_truncated
hugo-dc Jan 9, 2025
1fb823c
Move tests from eest eip3540/test_code_validation.py to evmone
hugo-dc Feb 12, 2025
bade46b
Separate dataloadn tests into valid and invalid
hugo-dc Feb 12, 2025
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
2 changes: 1 addition & 1 deletion test/unittests/eof_validation_stack_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ TEST_F(eof_validation, forwards_rjumpv_variable_stack)

TEST_F(eof_validation, self_referencing_jumps)
{
// rjumpf from stack 0 to stack 0
// rjump from stack 0 to stack 0
add_test_case(eof_bytecode(rjump(-3)), EOFValidationError::success, "rjump");

// rjumpi from stack 0 to stack 1
Expand Down
134 changes: 115 additions & 19 deletions test/unittests/eof_validation_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ TEST_F(eof_validation, EOF1_code_section_0_size)

TEST_F(eof_validation, EOF1_data_section_before_code_section)
{
add_test_case("EF0001 010004 030001 0200010001 00 00800000 AA FE",
add_test_case("EF0001 010004 040001 0200010001 00 00800000 AA FE",
EOFValidationError::code_section_missing);
}

Expand Down Expand Up @@ -263,14 +263,24 @@ TEST_F(eof_validation, EOF1_invalid_type_section_size)

TEST_F(eof_validation, EOF1_invalid_section_0_type)
{
add_test_case("EF0001 010004 0200010001 040000 00 00000000 00",
add_test_case("EF0001 010004 0200010002 040000 00 00000000 5FE4",
EOFValidationError::invalid_first_section_type);
add_test_case("EF0001 010004 0200010003 040000 00 00010000 60005C",
EOFValidationError::invalid_first_section_type);
add_test_case("EF0001 010004 0200010001 040000 00 01800000 FE",
add_test_case("EF0001 010004 0200010002 040000 00 007F0000 5FE4",
EOFValidationError::invalid_first_section_type);
add_test_case("EF0001 010004 0200010002 040000 00 00810000 5FE4",
EOFValidationError::invalid_first_section_type);
add_test_case("EF0001 010004 0200010002 040000 00 00FF0000 5FE4",
EOFValidationError::invalid_first_section_type);
add_test_case("EF0001 010004 0200010002 040000 00 01800000 50E4",
EOFValidationError::invalid_first_section_type);
add_test_case("EF0001 010004 0200010003 040000 00 02030000 60005C",
EOFValidationError::invalid_first_section_type);
add_test_case("EF0001 010004 0200010002 040000 00 80800000 50E4",
EOFValidationError::invalid_first_section_type);
add_test_case("EF0001 010004 0200010002 040000 00 FF800000 50E4",
EOFValidationError::invalid_first_section_type);
}

TEST_F(eof_validation, EOF1_too_many_code_sections)
Expand Down Expand Up @@ -459,7 +469,7 @@ TEST_F(eof_validation, EOF1_rjump_invalid_destination)

// To before code begin (offset = -13)
add_test_case(
eof_bytecode(rjump(-13) + OP_STOP), EOFValidationError::invalid_rjump_destination);
eof_bytecode(rjump(-23) + OP_STOP), EOFValidationError::invalid_rjump_destination);

// To after code end (offset = 2)
add_test_case(eof_bytecode(rjump(2) + OP_STOP), EOFValidationError::invalid_rjump_destination);
Expand Down Expand Up @@ -495,7 +505,7 @@ TEST_F(eof_validation, EOF1_rjumpi_invalid_destination)

// To before code begin (offset = -15)
add_test_case(
eof_bytecode(rjumpi(-15, 0) + OP_STOP, 1), EOFValidationError::invalid_rjump_destination);
eof_bytecode(rjumpi(-25, 0) + OP_STOP, 1), EOFValidationError::invalid_rjump_destination);

// To after code end (offset = 2)
add_test_case(
Expand Down Expand Up @@ -529,8 +539,8 @@ TEST_F(eof_validation, EOF1_rjumpi_invalid_destination)

TEST_F(eof_validation, EOF1_rjumpv_invalid_destination)
{
// table = [-23] case = 0
add_test_case(eof_bytecode(rjumpv({-23}, 0) + push(1) + OP_STOP, 1),
// table = [-25] case = 0
add_test_case(eof_bytecode(rjumpv({-25}, 0) + push(1) + OP_STOP, 1),
EOFValidationError::invalid_rjump_destination);

// table = [-8] case = 0
Expand All @@ -550,8 +560,8 @@ TEST_F(eof_validation, EOF1_rjumpv_invalid_destination)
EOFValidationError::invalid_rjump_destination);


// table = [0,3,-27] case = 2
add_test_case(eof_bytecode(rjumpv({0, 3, -27}, 2) + push(1) + OP_STOP + push(2) + OP_STOP, 1),
// table = [0,3,-30] case = 2
add_test_case(eof_bytecode(rjumpv({0, 3, -30}, 2) + push(1) + OP_STOP + push(2) + OP_STOP, 1),
EOFValidationError::invalid_rjump_destination);

// table = [0,3,-12] case = 2
Expand Down Expand Up @@ -733,16 +743,7 @@ TEST_F(eof_validation, multiple_code_sections_headers)
EOFValidationError::data_section_missing);
}

TEST_F(eof_validation, EOF1_dataloadn_truncated)
{
add_test_case("EF0001 010004 0200010001 040000 00 00800000 D1",
EOFValidationError::truncated_instruction);

add_test_case("EF0001 010004 0200010002 040000 00 00800000 D100",
EOFValidationError::truncated_instruction);
}

TEST_F(eof_validation, dataloadn)
TEST_F(eof_validation, dataloadn_valid)
{
// DATALOADN{0}
add_test_case(eof_bytecode(dataloadn(0) + OP_POP + OP_STOP, 1)
Expand All @@ -759,6 +760,16 @@ TEST_F(eof_validation, dataloadn)
.data("0000000000000000111111111111111122222222222222223333333333333333"
"0000000000000000111111111111111122222222222222223333333333333333"),
EOFValidationError::success);
}

TEST_F(eof_validation, dataloadn_invalid)
{
// Truncated DATALOADN
add_test_case("EF0001 010004 0200010001 040000 00 00800000 D1",
EOFValidationError::truncated_instruction);

add_test_case("EF0001 010004 0200010002 040000 00 00800000 D100",
EOFValidationError::truncated_instruction);

// DATALOADN{0} - no data section
add_test_case(eof_bytecode(dataloadn(0) + OP_POP + OP_STOP, 1),
Expand Down Expand Up @@ -873,6 +884,91 @@ TEST_F(eof_validation, unreachable_code_sections)
add_test_case(eof_bytecode(OP_INVALID).code(OP_INVALID, 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID).code(jumpf(1), 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID).code(callf(1) + OP_STOP, 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID).code(jumpf(0), 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID).code(callf(0) + OP_STOP, 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID).code(callf(1) + jumpf(0), 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID)
.code(OP_STOP, 0, 0x80, 0)
.code(jumpf(1), 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID)
.code(OP_STOP, 0, 0x80, 0)
.code(callf(1) + OP_STOP, 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID)
.code(jumpf(2), 0, 0x80, 0)
.code(jumpf(1), 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID)
.code(callf(2) + OP_STOP, 0, 0x80, 0)
.code(callf(1) + OP_STOP, 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID)
.code(callf(2) + OP_RETF, 0, 0, 0)
.code(callf(1) + OP_RETF, 0, 0, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(OP_INVALID)
.code(callf(2) + OP_STOP, 0, 0x80, 0)
.code(callf(1) + OP_RETF, 0, 0, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(callf(1) + OP_STOP)
.code(OP_RETF, 0, 0, 0)
.code(OP_INVALID, 0, 0x80, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(callf(2) + OP_STOP)
.code(OP_INVALID, 0, 0x80, 0)
.code(OP_RETF, 0, 0, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(callf(3) + OP_STOP)
.code(OP_INVALID, 0, 0x80, 0)
.code(OP_RETF, 0, 0, 0)
.code(callf(2) + OP_RETF, 0, 0, 0),
EOFValidationError::unreachable_code_sections);

add_test_case(eof_bytecode(jumpf(1))
.code(OP_STOP, 0, 0x80, 0)
.code(OP_RETF, 0, 0, 0),
EOFValidationError::unreachable_code_sections);

{
auto unreachable2_255 = eof_bytecode(jumpf(1)).code(jumpf(1), 0, 0x80, 0);
for (int i = 3; i < 255; ++i)
{
unreachable2_255.code(jumpf(static_cast<uint16_t>(i)), 0, 0x80, 0);
}
unreachable2_255.code(OP_STOP, 0, 0x80, 0);

auto unreachable255 = eof_bytecode(jumpf(1));
for (int i = 2; i < 255; ++i)
{
unreachable255.code(jumpf(static_cast<uint16_t>(i)), 0, 0x80, 0);
}
unreachable255.code(jumpf(254), 0, 0x80, 0).code(OP_STOP, 0, 0x80, 0);

add_test_case(unreachable2_255, EOFValidationError::unreachable_code_sections);
add_test_case(unreachable255, EOFValidationError::unreachable_code_sections);
}

add_test_case(eof_bytecode(callf(1) + OP_STOP, 0)
.code(bytecode{"5B"} + OP_RETF, 0, 0, 0)
.code(bytecode{"FE"}, 0, 0x80, 0),
Expand Down