Skip to content

Commit 774cfbb

Browse files
pdobaczchfast
authored andcommitted
t8n: exclude empty requests in result, but include type byte
Reference: https://github.com/ethereum/execution-apis/pull/599/files.
1 parent bea97ef commit 774cfbb

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

test/integration/t8n/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ add_test(
146146
)
147147
string(
148148
JOIN ".*" EXPECTED_OUT
149-
# empty requests list of exactly 3 elements (withdrawals, deposits, consolidations)
150-
[=["requests": \[[^],]*"0x",[^],]*"0x",[^],]*"0x"[^,]*\]]=]
149+
# empty requests list
150+
[=["requests": \[\]]=]
151151
# requests hash should be present
152-
[=["requestsHash": "0x6036c41849da9c076ed79654d434017387a88fb833c2856b32e18218b3341c5f"]=]
152+
[=["requestsHash": "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"]=]
153153
)
154154
set_tests_properties(
155155
${PREFIX}/${TEST_CASE}/out.json PROPERTIES

test/t8n/t8n.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,12 @@ int main(int argc, const char* argv[])
255255
{
256256
// EIP-7685: General purpose execution layer requests
257257
j_result["requests"] = json::json::array();
258-
for (size_t i = 0; i < requests.size(); ++i)
259-
j_result["requests"][i] = hex0x(requests[i].data());
258+
for (const auto& r : requests)
259+
{
260+
if (!r.data().empty())
261+
// Only report non-empty requests. Include the leading type byte.
262+
j_result["requests"].emplace_back(hex0x(r.raw_data));
263+
}
260264

261265
auto requests_hash = calculate_requests_hash(requests);
262266

0 commit comments

Comments
 (0)