fix Vbft Block serdes (#989)

* fix Vbft Block serdes

* enforce merkleRoot data in Block msg

* fix error handlings

consensus/vbft/msg_types_test.go

@@ -434,3 +434,31 @@ func TestBlockFetchRespMsgDeserialize(t *testing.T) {
 	}
 	t.Logf("BlockFetchRespMsg Serialize succ: %v\n", respmsg.BlockNumber)
 }
+
+func TestBlockSerialization(t *testing.T) {
+	blk, err := constructBlock()
+	if err != nil {
+		t.Errorf("constructBlock failed: %v", err)
+		return
+	}
+
+	data, err := blk.Serialize()
+	if err != nil {
+		t.Fatalf("serialize blk: %s", err)
+	}
+
+	blk2 := &Block{}
+	if err := blk2.Deserialize(data); err != nil {
+		t.Fatalf("deserialize blk: %s", err)
+	}
+
+	blk.EmptyBlock = nil
+	data2, err := blk.Serialize()
+	if err != nil {
+		t.Fatalf("serialize blk2: %s", err)
+	}
+	blk3 := &Block{}
+	if err := blk3.Deserialize(data2); err != nil {
+		t.Fatalf("deserialize blk2: %s", err)
+	}
+}

consensus/vbft/types.go

@@ -24,7 +24,6 @@ import (
 	"io"
 
 	"github.com/ontio/ontology/common"
-	"github.com/ontio/ontology/common/log"
 	"github.com/ontio/ontology/consensus/vbft/config"
 	"github.com/ontio/ontology/core/types"
 )
@@ -78,6 +77,7 @@ func (blk *Block) Serialize() ([]byte, error) {
 	payload := common.NewZeroCopySink(nil)
 	payload.WriteVarBytes(sink.Bytes())
 
+	payload.WriteBool(blk.EmptyBlock != nil)
 	if blk.EmptyBlock != nil {
 		sink2 := common.NewZeroCopySink(nil)
 		blk.EmptyBlock.Serialization(sink2)
@@ -109,22 +109,29 @@ func (blk *Block) Deserialize(data []byte) error {
 	}
 
 	var emptyBlock *types.Block
-	if source.Len() > 0 {
+	hasEmptyBlock, irr, eof := source.NextBool()
+	if irr {
+		return fmt.Errorf("read empty-block-bool: %s", common.ErrIrregularData)
+	}
+	if eof {
+		return fmt.Errorf("read empty-block-bool: %s", io.ErrUnexpectedEOF)
+	}
+	if hasEmptyBlock {
 		buf2, _, irregular, eof := source.NextVarBytes()
-		if irregular == false && eof == false {
-			block2, err := types.BlockFromRawBytes(buf2)
-			if err == nil {
-				emptyBlock = block2
-			}
+		if irregular || eof {
+			return fmt.Errorf("read empty block failed: %v, %v", irregular, eof)
+		}
+		block2, err := types.BlockFromRawBytes(buf2)
+		if err != nil {
+			return fmt.Errorf("deserialize empty blk failed: %s", err)
 		}
+		emptyBlock = block2
 	}
+
 	var merkleRoot common.Uint256
-	if source.Len() > 0 {
-		merkleRoot, eof = source.NextHash()
-		if eof {
-			log.Errorf("Block Deserialize merkleRoot")
-			return io.ErrUnexpectedEOF
-		}
+	merkleRoot, eof = source.NextHash()
+	if eof {
+		return fmt.Errorf("block deserialize merkleRoot: %s", io.ErrUnexpectedEOF)
 	}
 	blk.Block = block
 	blk.EmptyBlock = emptyBlock