mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-20 10:52:25 +00:00
core: reuse the existed define of StoredReceiptRLP
This commit is contained in:
parent
c41105ce80
commit
da2170cc1d
2 changed files with 9 additions and 18 deletions
|
|
@ -669,15 +669,6 @@ func DeleteReceipts(db ethdb.KeyValueWriter, hash common.Hash, number uint64) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// storedReceiptRLP is the storage encoding of a receipt.
|
|
||||||
// Re-definition in core/types/receipt.go.
|
|
||||||
// TODO: Re-use the existing definition.
|
|
||||||
type storedReceiptRLP struct {
|
|
||||||
PostStateOrStatus []byte
|
|
||||||
CumulativeGasUsed uint64
|
|
||||||
Logs []*types.Log
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReceiptLogs is a barebone version of ReceiptForStorage which only keeps
|
// ReceiptLogs is a barebone version of ReceiptForStorage which only keeps
|
||||||
// the list of logs. When decoding a stored receipt into this object we
|
// the list of logs. When decoding a stored receipt into this object we
|
||||||
// avoid creating the bloom filter.
|
// avoid creating the bloom filter.
|
||||||
|
|
@ -687,7 +678,7 @@ type receiptLogs struct {
|
||||||
|
|
||||||
// DecodeRLP implements rlp.Decoder.
|
// DecodeRLP implements rlp.Decoder.
|
||||||
func (r *receiptLogs) DecodeRLP(s *rlp.Stream) error {
|
func (r *receiptLogs) DecodeRLP(s *rlp.Stream) error {
|
||||||
var stored storedReceiptRLP
|
var stored types.StoredReceiptRLP
|
||||||
if err := s.Decode(&stored); err != nil {
|
if err := s.Decode(&stored); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,13 @@ type Receipt struct {
|
||||||
TransactionIndex uint `json:"transactionIndex"`
|
TransactionIndex uint `json:"transactionIndex"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// StoredReceiptRLP is the storage encoding of a receipt.
|
||||||
|
type StoredReceiptRLP struct {
|
||||||
|
PostStateOrStatus []byte
|
||||||
|
CumulativeGasUsed uint64
|
||||||
|
Logs []*Log
|
||||||
|
}
|
||||||
|
|
||||||
type receiptMarshaling struct {
|
type receiptMarshaling struct {
|
||||||
Type hexutil.Uint64
|
Type hexutil.Uint64
|
||||||
PostState hexutil.Bytes
|
PostState hexutil.Bytes
|
||||||
|
|
@ -94,13 +101,6 @@ type receiptRLP struct {
|
||||||
Logs []*Log
|
Logs []*Log
|
||||||
}
|
}
|
||||||
|
|
||||||
// storedReceiptRLP is the storage encoding of a receipt.
|
|
||||||
type storedReceiptRLP struct {
|
|
||||||
PostStateOrStatus []byte
|
|
||||||
CumulativeGasUsed uint64
|
|
||||||
Logs []*Log
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewReceipt creates a barebone transaction receipt, copying the init fields.
|
// NewReceipt creates a barebone transaction receipt, copying the init fields.
|
||||||
// Deprecated: create receipts using a struct literal instead.
|
// Deprecated: create receipts using a struct literal instead.
|
||||||
func NewReceipt(root []byte, failed bool, cumulativeGasUsed uint64) *Receipt {
|
func NewReceipt(root []byte, failed bool, cumulativeGasUsed uint64) *Receipt {
|
||||||
|
|
@ -282,7 +282,7 @@ func (r *ReceiptForStorage) EncodeRLP(_w io.Writer) error {
|
||||||
// DecodeRLP implements rlp.Decoder, and loads both consensus and implementation
|
// DecodeRLP implements rlp.Decoder, and loads both consensus and implementation
|
||||||
// fields of a receipt from an RLP stream.
|
// fields of a receipt from an RLP stream.
|
||||||
func (r *ReceiptForStorage) DecodeRLP(s *rlp.Stream) error {
|
func (r *ReceiptForStorage) DecodeRLP(s *rlp.Stream) error {
|
||||||
var stored storedReceiptRLP
|
var stored StoredReceiptRLP
|
||||||
if err := s.Decode(&stored); err != nil {
|
if err := s.Decode(&stored); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue