Del BlockSignatureMsg unused Height field (#293)

[bytom/vapor.git] / netsync / consensusmgr / consensus_msg_test.go

diff --git a/netsync/consensusmgr/consensus_msg_test.go b/netsync/consensusmgr/consensus_msg_test.go
index ea4e004..d00c93b 100644 (file)
--- a/netsync/consensusmgr/consensus_msg_test.go
+++ b/netsync/consensusmgr/consensus_msg_test.go
@@ -26,7 +26,7 @@ func TestDecodeMessage(t *testing.T) {
                        msg: &BlockSignatureMsg{
                                BlockHash: [32]byte{0x01},
                                Signature: []byte{0x00},
-                               PubKey:    [32]byte{0x01},
+                               PubKey:    []byte{0x01},
                        },
                        msgType: blockSignatureByte,
                },
@@ -55,11 +55,10 @@ func TestDecodeMessage(t *testing.T) {
 func TestBlockSignBroadcastMsg(t *testing.T) {
        blockSignMsg := &BlockSignatureMsg{
                BlockHash: [32]byte{0x01},
-               Height:    100,
                Signature: []byte{0x00},
-               PubKey:    [32]byte{0x01},
+               PubKey:    []byte{0x01},
        }
-       signatureBroadcastMsg := NewBroadcastMsg(NewBlockSignatureMsg(bc.NewHash(blockSignMsg.BlockHash), blockSignMsg.Height, blockSignMsg.Signature, blockSignMsg.PubKey), consensusChannel)
+       signatureBroadcastMsg := NewBroadcastMsg(NewBlockSignatureMsg(bc.NewHash(blockSignMsg.BlockHash), blockSignMsg.Signature, blockSignMsg.PubKey), consensusChannel)
 
        binMsg := wire.BinaryBytes(signatureBroadcastMsg.GetMsg())
        gotMsgType, gotMsg, err := decodeMessage(binMsg)
@@ -139,16 +138,15 @@ func TestBlockProposeMsg(t *testing.T) {
 func TestBlockSignatureMsg(t *testing.T) {
        msg := &BlockSignatureMsg{
                BlockHash: [32]byte{0x01},
-               Height:    100,
                Signature: []byte{0x00},
-               PubKey:    [32]byte{0x01},
+               PubKey:    []byte{0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
        }
-       gotMsg := NewBlockSignatureMsg(bc.NewHash(msg.BlockHash), msg.Height, msg.Signature, msg.PubKey)
+       gotMsg := NewBlockSignatureMsg(bc.NewHash(msg.BlockHash), msg.Signature, msg.PubKey)
 
        if !reflect.DeepEqual(gotMsg, msg) {
                t.Fatalf("test block signature message err. got:%s\n want:%s", spew.Sdump(gotMsg), spew.Sdump(msg))
        }
-       wantString := "{block_hash: 0100000000000000000000000000000000000000000000000000000000000000,block_height:100,signature:00,pubkey:0100000000000000000000000000000000000000000000000000000000000000}"
+       wantString := "{block_hash: 0100000000000000000000000000000000000000000000000000000000000000,signature:00,pubkey:01000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}"
        if gotMsg.String() != wantString {
                t.Fatalf("test block signature message err. got string:%s\n want string:%s", gotMsg.String(), wantString)
        }