downloader: Propagate errors

Author: palango

core/types/block.go

@@ -105,12 +105,18 @@ func (h *Header) SanityCheck() error {
 
 // EmptyBody returns true if there is no additional 'body' to complete the header
 // that is: no transactions.
-func (h *Header) EmptyBody() bool {
-	if extra, err := h.IstanbulExtra(); err == nil && extra != nil {
-		return false
+func (h *Header) EmptyBody() (bool, error) {
+	extra, err := h.IstanbulExtra()
+
+	if err != nil {
+		return false, err
+	}
+
+	if extra != nil {
+		return false, nil
 	}
 
-	return h.TxHash == EmptyRootHash
+	return h.TxHash == EmptyRootHash, nil
 }
 
 // EmptyReceipts returns true if there are no receipts for this header/block.

eth/downloader/queue.go

@@ -71,17 +71,21 @@ type fetchResult struct {
 	EpochSnarkData *types.EpochSnarkData
 }
 
-func newFetchResult(header *types.Header, fastSync bool) *fetchResult {
+func newFetchResult(header *types.Header, fastSync bool) (*fetchResult, error) {
 	item := &fetchResult{
 		Header: header,
 	}
-	if !header.EmptyBody() {
+	emptyBody, err := header.EmptyBody()
+	if err != nil {
+		return nil, err
+	}
+	if !emptyBody {
 		item.pending |= (1 << bodyType)
 	}
 	if fastSync && !header.EmptyReceipts() {
 		item.pending |= (1 << receiptType)
 	}
-	return item
+	return item, nil
 }
 
 // SetBodyDone flags the body as finished.

eth/downloader/resultstore.go

@@ -85,7 +85,7 @@ func (r *resultStore) AddFetch(header *types.Header, fastSync bool) (stale, thro
 		return stale, throttled, item, err
 	}
 	if item == nil {
-		item = newFetchResult(header, fastSync)
+		item, err = newFetchResult(header, fastSync)
 		r.items[index] = item
 	}
 	return stale, throttled, item, err

les/downloader/queue.go

@@ -71,17 +71,21 @@ type fetchResult struct {
 	EpochSnarkData *types.EpochSnarkData
 }
 
-func newFetchResult(header *types.Header, fastSync bool) *fetchResult {
+func newFetchResult(header *types.Header, fastSync bool) (*fetchResult, error) {
 	item := &fetchResult{
 		Header: header,
 	}
-	if !header.EmptyBody() {
+	emptyBody, err := header.EmptyBody()
+	if err != nil {
+		return nil, err
+	}
+	if !emptyBody {
 		item.pending |= (1 << bodyType)
 	}
 	if fastSync && !header.EmptyReceipts() {
 		item.pending |= (1 << receiptType)
 	}
-	return item
+	return item, nil
 }
 
 // SetBodyDone flags the body as finished.

les/downloader/resultstore.go

@@ -85,7 +85,7 @@ func (r *resultStore) AddFetch(header *types.Header, fastSync bool) (stale, thro
 		return stale, throttled, item, err
 	}
 	if item == nil {
-		item = newFetchResult(header, fastSync)
+		item, err = newFetchResult(header, fastSync)
 		r.items[index] = item
 	}
 	return stale, throttled, item, err