From d5e57948d1d889b129be87e2cbcdbfaa727ef5ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 14 Apr 2021 23:39:42 +0300
Subject: [PATCH] core/types: drop some relice data types
---
core/types/block.go | 32 --------------------------------
1 file changed, 32 deletions(-)
diff --git a/core/types/block.go b/core/types/block.go
index 553db003b..a3318f877 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -166,19 +166,6 @@ type Block struct {
ReceivedFrom interface{}
}
-// DeprecatedTd is an old relic for extracting the TD of a block. It is in the
-// code solely to facilitate upgrading the database from the old format to the
-// new, after which it should be deleted. Do not use!
-func (b *Block) DeprecatedTd() *big.Int {
- return b.td
-}
-
-// [deprecated by eth/63]
-// StorageBlock defines the RLP encoding of a Block stored in the
-// state database. The StorageBlock encoding contains fields that
-// would otherwise need to be recomputed.
-type StorageBlock Block
-
// "external" block encoding. used for eth protocol, etc.
type extblock struct {
Header *Header
@@ -186,15 +173,6 @@ type extblock struct {
Uncles []*Header
}
-// [deprecated by eth/63]
-// "storage" block encoding. used for database.
-type storageblock struct {
- Header *Header
- Txs []*Transaction
- Uncles []*Header
- TD *big.Int
-}
-
// NewBlock creates a new block. The input data is copied,
// changes to header and to the field values will not affect the
// block.
@@ -279,16 +257,6 @@ func (b *Block) EncodeRLP(w io.Writer) error {
})
}
-// [deprecated by eth/63]
-func (b *StorageBlock) DecodeRLP(s *rlp.Stream) error {
- var sb storageblock
- if err := s.Decode(&sb); err != nil {
- return err
- }
- b.header, b.uncles, b.transactions, b.td = sb.Header, sb.Uncles, sb.Txs, sb.TD
- return nil
-}
-
// TODO: copies
func (b *Block) Uncles() []*Header { return b.uncles }