From 621062f65376a9f56b3a8769fcd9e32cf31cf6cb Mon Sep 17 00:00:00 2001 From: zelig Date: Sat, 3 Jan 2015 05:25:55 +0000 Subject: [PATCH] fix rlp for blocksMsg and getBlocksMsg in eth protocol --- eth/protocol.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eth/protocol.go b/eth/protocol.go index 069211bda9..5b09a60e3b 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -186,7 +186,7 @@ func (self *ethProtocol) handle() error { } block := self.chainManager.GetBlock(hash) if block != nil { - blocks = append(blocks, block.RlpData()) + blocks = append(blocks, block) } if i == blockHashesBatchSize { break @@ -198,7 +198,7 @@ func (self *ethProtocol) handle() error { msgStream := rlp.NewStream(msg.Payload) msgStream.List() for { - var block [1]*types.Block + var block *types.Block if err := msgStream.Decode(&block); err != nil { if err == rlp.EOL { break @@ -206,7 +206,7 @@ func (self *ethProtocol) handle() error { return self.protoError(ErrDecode, "msg %v: %v", msg, err) } } - self.blockPool.AddBlock(block[0], self.id) + self.blockPool.AddBlock(block, self.id) } case NewBlockMsg: