forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-16 20:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/protocols: put empty list as a placeholder for unavailable responses

Browse source
This commit is contained in:
healthykim 2026-04-17 11:09:50 +02:00
parent 765a37f426
commit 92cef0a740
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
eth/protocols/eth/handler_test.go
View file

@ -422,7 +422,7 @@ func testGetBlockBodies(t *testing.T, protocol uint) {
{limit + 1, nil, nil, limit}, // No more than the possible block count should be returned {limit + 1, nil, nil, limit}, // No more than the possible block count should be returned
{0, []common.Hash{backend.chain.Genesis().Hash()}, []bool{true}, 1}, // The genesis block should be retrievable {0, []common.Hash{backend.chain.Genesis().Hash()}, []bool{true}, 1}, // The genesis block should be retrievable
{0, []common.Hash{backend.chain.CurrentBlock().Hash()}, []bool{true}, 1}, // The chains head block should be retrievable {0, []common.Hash{backend.chain.CurrentBlock().Hash()}, []bool{true}, 1}, // The chains head block should be retrievable
{0, []common.Hash{{}}, []bool{false}, 0}, // A non existent block should not be returned {0, []common.Hash{{}}, []bool{false}, 1}, // A non existent block should not be returned
// Existing and non-existing blocks interleaved should not cause problems // Existing and non-existing blocks interleaved should not cause problems
{0, []common.Hash{ {0, []common.Hash{
@ -433,7 +433,7 @@ func testGetBlockBodies(t *testing.T, protocol uint) {
{}, {},
backend.chain.GetBlockByNumber(100).Hash(), backend.chain.GetBlockByNumber(100).Hash(),
{}, {},
}, []bool{false, true, false, true, false, true, false}, 3}, }, []bool{false, true, false, true, false, true, false}, 7},
} }
// Run each of the tests and verify the results against the chain // Run each of the tests and verify the results against the chain
for i, tt := range tests { for i, tt := range tests {
@ -460,9 +460,13 @@ func testGetBlockBodies(t *testing.T, protocol uint) {
} }
for j, hash := range tt.explicit { for j, hash := range tt.explicit {
hashes = append(hashes, hash) hashes = append(hashes, hash)
if tt.available[j] && len(bodies) < tt.expected { if len(bodies) < tt.expected {
block := backend.chain.GetBlockByHash(hash) if tt.available[j] {
bodies = append(bodies, encodeBody(block)) block := backend.chain.GetBlockByHash(hash)
bodies = append(bodies, encodeBody(block))
} else {
bodies = append(bodies, BlockBody{})
}
} }
} }
@ -590,9 +594,9 @@ func testGetBlockReceipts(t *testing.T, protocol uint) {
) )
for i := uint64(0); i <= backend.chain.CurrentBlock().Number.Uint64(); i++ { for i := uint64(0); i <= backend.chain.CurrentBlock().Number.Uint64(); i++ {
if i == 1 { if i == 1 {
// Insert a missing block hash to verify the server returns a nil placeholder // Insert a missing block hash to verify the server returns an empty placeholder
hashes = append(hashes, common.HexToHash("0xdeadbeef")) hashes = append(hashes, common.HexToHash("0xdeadbeef"))
receipts.Append(nil) receipts.AppendRaw(rlp.EmptyList)
} }
block := backend.chain.GetBlockByNumber(i) block := backend.chain.GetBlockByNumber(i)
hashes = append(hashes, block.Hash()) hashes = append(hashes, block.Hash())

15
eth/protocols/eth/handlers.go
View file

@ -241,6 +241,9 @@ func ServiceGetBlockBodiesQuery(chain *core.BlockChain, query GetBlockBodiesRequ
if data := chain.GetBodyRLP(hash); len(data) != 0 { if data := chain.GetBodyRLP(hash); len(data) != 0 {
bodies = append(bodies, data) bodies = append(bodies, data)
bytes += len(data) bytes += len(data)
} else {
// Append an empty body [[], []] as placeholder for missing block
bodies = append(bodies, []byte{0xc2, 0xc0, 0xc0})
} }
} }
return bodies return bodies
@ -281,18 +284,18 @@ func ServiceGetReceiptsQuery69(chain *core.BlockChain, query GetReceiptsRequest)
// Retrieve the requested block's receipts // Retrieve the requested block's receipts
results := chain.GetReceiptsRLP(hash) results := chain.GetReceiptsRLP(hash)
if results == nil { if results == nil {
receipts.Append(nil) receipts.AppendRaw(rlp.EmptyList)
continue continue
} }
body := chain.GetBodyRLP(hash) body := chain.GetBodyRLP(hash)
if body == nil { if body == nil {
receipts.Append(nil) receipts.AppendRaw(rlp.EmptyList)
continue continue
} }
results, _, err := blockReceiptsToNetwork(results, body, receiptQueryParams{}) results, _, err := blockReceiptsToNetwork(results, body, receiptQueryParams{})
if err != nil { if err != nil {
log.Error("Error in block receipts conversion", "hash", hash, "err", err) log.Error("Error in block receipts conversion", "hash", hash, "err", err)
receipts.Append(nil) receipts.AppendRaw(rlp.EmptyList)
continue continue
} }
receipts.AppendRaw(results) receipts.AppendRaw(results)
@ -316,12 +319,12 @@ func serviceGetReceiptsQuery70(chain *core.BlockChain, query GetReceiptsRequest,
} }
results := chain.GetReceiptsRLP(hash) results := chain.GetReceiptsRLP(hash)
if results == nil { if results == nil {
receipts.Append(nil) receipts.AppendRaw(rlp.EmptyList)
continue continue
} }
body := chain.GetBodyRLP(hash) body := chain.GetBodyRLP(hash)
if body == nil { if body == nil {
receipts.Append(nil) receipts.AppendRaw(rlp.EmptyList)
continue continue
} }
q := receiptQueryParams{sizeLimit: uint64(maxPacketSize - bytes)} q := receiptQueryParams{sizeLimit: uint64(maxPacketSize - bytes)}
@ -331,7 +334,7 @@ func serviceGetReceiptsQuery70(chain *core.BlockChain, query GetReceiptsRequest,
results, incomplete, err := blockReceiptsToNetwork(results, body, q) results, incomplete, err := blockReceiptsToNetwork(results, body, q)
if err != nil { if err != nil {
log.Error("Error in block receipts conversion", "hash", hash, "err", err) log.Error("Error in block receipts conversion", "hash", hash, "err", err)
receipts.Append(nil) receipts.AppendRaw(rlp.EmptyList)
continue continue
} }
if results == nil { if results == nil {