core: read the raw blob from storage, do not unmarshal it unnecessarily

Author: MariusVanDerWijden

core/blockchain_reader.go

@@ -232,12 +232,12 @@ func (bc *BlockChain) GetReceiptsByHash(hash common.Hash) types.Receipts {
 
 // GetRawReceiptsByHash retrieves the receipts for all transactions in a given block
 // without deriving the internal fields and the Bloom.
-func (bc *BlockChain) GetRawReceiptsByHash(hash common.Hash) types.Receipts {
+func (bc *BlockChain) GetRawReceiptsByHash(hash common.Hash) rlp.RawValue {
 	number := rawdb.ReadHeaderNumber(bc.db, hash)
 	if number == nil {
 		return nil
 	}
-	receipts := rawdb.ReadRawReceipts(bc.db, hash, *number)
+	receipts := rawdb.ReadReceiptsRLP(bc.db, hash, *number)
 	if receipts == nil {
 		return nil
 	}

eth/protocols/eth/handlers.go

@@ -303,18 +303,8 @@ func serviceGetReceiptsQuery69(chain *core.BlockChain, query GetReceiptsRequest)
 				continue
 			}
 		}
-		// Remove unnecessary fields
-		var storageReceipts []*types.ReceiptForStorage
-		for _, receipt := range results {
-			storageReceipts = append(storageReceipts, (*types.ReceiptForStorage)(receipt))
-		}
-		// If known, encode and queue for response packet
-		if encoded, err := rlp.EncodeToBytes(storageReceipts); err != nil {
-			log.Error("Failed to encode receipt", "err", err)
-		} else {
-			receipts = append(receipts, encoded)
-			bytes += len(encoded)
-		}
+		receipts = append(receipts, results)
+		bytes += len(results)
 	}
 	return receipts
 }