Skip to content

Commit

Permalink
core/types: drop some relice data types
Browse files Browse the repository at this point in the history
  • Loading branch information
karalabe committed Apr 14, 2021
1 parent 7088f1e commit d5e5794
Showing 1 changed file with 0 additions and 32 deletions.
32 changes: 0 additions & 32 deletions core/types/block.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,35 +166,13 @@ 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
Txs []*Transaction
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.
Expand Down Expand Up @@ -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 }
Expand Down

0 comments on commit d5e5794

Please sign in to comment.