fix rlp for blocksMsg and getBlocksMsg in eth protocol

This commit is contained in:
zelig 2015-01-03 05:25:55 +00:00
parent eb88474d84
commit 0e5e7eb310

View file

@ -186,7 +186,7 @@ func (self *ethProtocol) handle() error {
} }
block := self.chainManager.GetBlock(hash) block := self.chainManager.GetBlock(hash)
if block != nil { if block != nil {
blocks = append(blocks, block.RlpData()) blocks = append(blocks, block)
} }
if i == blockHashesBatchSize { if i == blockHashesBatchSize {
break break
@ -198,7 +198,7 @@ func (self *ethProtocol) handle() error {
msgStream := rlp.NewStream(msg.Payload) msgStream := rlp.NewStream(msg.Payload)
msgStream.List() msgStream.List()
for { for {
var block [1]*types.Block var block *types.Block
if err := msgStream.Decode(&block); err != nil { if err := msgStream.Decode(&block); err != nil {
if err == rlp.EOL { if err == rlp.EOL {
break break
@ -206,7 +206,7 @@ func (self *ethProtocol) handle() error {
return self.protoError(ErrDecode, "msg %v: %v", msg, err) return self.protoError(ErrDecode, "msg %v: %v", msg, err)
} }
} }
self.blockPool.AddBlock(block[0], self.id) self.blockPool.AddBlock(block, self.id)
} }
case NewBlockMsg: case NewBlockMsg: