vote supports customized enc/dec

core/types/chamber_proposal.go

@@ -126,7 +126,7 @@ func (p *Proposal) ValidateBasic() error {
 }
 
 // block will be append to end of stream
-type ProposalRaw struct {
+type proposalRaw struct {
 	Height    uint64
 	Round     uint32
 	POLRound  uint32
@@ -136,7 +136,7 @@ type ProposalRaw struct {
 }
 
 func (p *Proposal) EncodeRLP(w io.Writer) error {
-	if err := rlp.Encode(w, ProposalRaw{
+	if err := rlp.Encode(w, proposalRaw{
 		Height:    uint64(p.Height),
 		Round:     uint32(p.Round),
 		POLRound:  uint32(p.POLRound),
@@ -151,7 +151,7 @@ func (p *Proposal) EncodeRLP(w io.Writer) error {
 }
 
 func (p *Proposal) DecodeRLP(s *rlp.Stream) error {
-	var pr ProposalRaw
+	var pr proposalRaw
 	if err := s.Decode(&pr); err != nil {
 		return err
 	}

core/types/chamber_vote.go

@@ -3,6 +3,7 @@ package types
 import (
 	"errors"
 	"fmt"
+	"io"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rlp"
@@ -153,3 +154,45 @@ func (vote *Vote) ValidateBasic() error {
 
 	return nil
 }
+
+type voteRaw struct {
+	Type             uint32
+	Height           uint64
+	Round            uint32
+	BlockID          common.Hash
+	Timestamp        uint64
+	ValidatorAddress common.Address
+	ValidatorIndex   uint32
+	Signature        []byte
+}
+
+func (v *Vote) EncodeRLP(w io.Writer) error {
+	return rlp.Encode(w, &voteRaw{
+		Type:             uint32(v.Type),
+		Height:           uint64(v.Height),
+		Round:            uint32(v.Round),
+		BlockID:          v.BlockID,
+		Timestamp:        uint64(v.TimestampMs),
+		ValidatorAddress: v.ValidatorAddress,
+		ValidatorIndex:   uint32(v.ValidatorIndex),
+		Signature:        v.Signature,
+	})
+}
+
+func (v *Vote) DecodeRLP(s *rlp.Stream) error {
+	var vr voteRaw
+	if err := s.Decode(&vr); err != nil {
+		return err
+	}
+
+	v.Type = SignedMsgType(vr.Type)
+	v.Height = vr.Height
+	v.Round = int32(vr.Round)
+	v.BlockID = vr.BlockID
+	v.TimestampMs = vr.Timestamp
+	v.ValidatorAddress = vr.ValidatorAddress
+	v.ValidatorIndex = int32(vr.ValidatorIndex)
+	v.Signature = vr.Signature
+
+	return nil
+}