Remove remnants of requests from block body downloader (#12426)

Block bodies no longer have requests after PR #12370
erigontech · Oct 24, 2024 · ffd94c2 · ffd94c2
1 parent 8b7aa87
commit ffd94c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/turbo/stages/bodydownload/body_algos.go b/turbo/stages/bodydownload/body_algos.go
@@ -228,7 +228,8 @@ func (bd *BodyDownload) RequestSent(bodyReq *BodyRequest, timeWithTimeout uint64
 }
 
 // DeliverBodies takes the block body received from a peer and adds it to the various data structures
-func (bd *BodyDownload) DeliverBodies(txs [][][]byte, uncles [][]*types.Header, withdrawals []types.Withdrawals, lenOfP2PMsg uint64, peerID [64]byte,
+func (bd *BodyDownload) DeliverBodies(txs [][][]byte, uncles [][]*types.Header, withdrawals []types.Withdrawals,
+	lenOfP2PMsg uint64, peerID [64]byte,
 ) {
 	bd.deliveryCh <- Delivery{txs: txs, uncles: uncles, withdrawals: withdrawals, lenOfP2PMessage: lenOfP2PMsg, peerID: peerID}
 

diff --git a/turbo/stages/bodydownload/body_data_struct.go b/turbo/stages/bodydownload/body_data_struct.go
@@ -12,8 +12,8 @@ import (
 	"github.com/ledgerwatch/erigon/core/types"
 )
 
-// BodyHashes is to be used for the mapping between TxHash, UncleHash, WithdrawalsHash, and RequestRoot to the block header
-type BodyHashes [4 * length.Hash]byte
+// BodyHashes is to be used for the mapping between TxHash, UncleHash, and WithdrawalsHash to the block header
+type BodyHashes [3 * length.Hash]byte
 
 const MaxBodiesInRequest = 1024
 
@@ -22,7 +22,6 @@ type Delivery struct {
 	txs             [][][]byte
 	uncles          [][]*types.Header
 	withdrawals     []types.Withdrawals
-	requests        []types.FlatRequests
 	lenOfP2PMessage uint64
 }