Merge pull request #1511 from karalabe/rlp-data-race

core: fix an RLP encoding data race due to deep struct copy
This commit is contained in:
Felix Lange 2015-07-22 20:10:41 +02:00
commit 26a269ea09

View File

@ -257,7 +257,7 @@ func (b *Block) DecodeRLP(s *rlp.Stream) error {
return nil return nil
} }
func (b Block) EncodeRLP(w io.Writer) error { func (b *Block) EncodeRLP(w io.Writer) error {
return rlp.Encode(w, extblock{ return rlp.Encode(w, extblock{
Header: b.header, Header: b.header,
Txs: b.transactions, Txs: b.transactions,
@ -274,7 +274,7 @@ func (b *StorageBlock) DecodeRLP(s *rlp.Stream) error {
return nil return nil
} }
func (b StorageBlock) EncodeRLP(w io.Writer) error { func (b *StorageBlock) EncodeRLP(w io.Writer) error {
return rlp.Encode(w, storageblock{ return rlp.Encode(w, storageblock{
Header: b.header, Header: b.header,
Txs: b.transactions, Txs: b.transactions,