change from field to bytes to avoid json marshalling corruption

This commit is contained in:
Jeromy 2017-01-09 09:52:07 -08:00
parent a5b52ed013
commit 25ef943eea
3 changed files with 7 additions and 8 deletions

View File

@ -8,7 +8,6 @@ import (
pb "github.com/libp2p/go-floodsub/pb"
proto "github.com/gogo/protobuf/proto"
logging "github.com/ipfs/go-log"
host "github.com/libp2p/go-libp2p-host"
inet "github.com/libp2p/go-libp2p-net"
@ -401,7 +400,7 @@ func (p *PubSub) Publish(topic string, data []byte) error {
&pb.Message{
Data: data,
TopicIDs: []string{topic},
From: proto.String(string(p.host.ID())),
From: []byte(p.host.ID()),
Seqno: seqno,
},
}

View File

@ -145,7 +145,7 @@ func (m *RPC_SubOpts) GetTopicid() string {
}
type Message struct {
From *string `protobuf:"bytes,1,opt,name=from" json:"from,omitempty"`
From []byte `protobuf:"bytes,1,opt,name=from" json:"from,omitempty"`
Data []byte `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"`
Seqno []byte `protobuf:"bytes,3,opt,name=seqno" json:"seqno,omitempty"`
TopicIDs []string `protobuf:"bytes,4,rep,name=topicIDs" json:"topicIDs,omitempty"`
@ -156,11 +156,11 @@ func (m *Message) Reset() { *m = Message{} }
func (m *Message) String() string { return proto.CompactTextString(m) }
func (*Message) ProtoMessage() {}
func (m *Message) GetFrom() string {
if m != nil && m.From != nil {
return *m.From
func (m *Message) GetFrom() []byte {
if m != nil {
return m.From
}
return ""
return nil
}
func (m *Message) GetData() []byte {

View File

@ -11,7 +11,7 @@ message RPC {
}
message Message {
optional string from = 1;
optional bytes from = 1;
optional bytes data = 2;
optional bytes seqno = 3;
repeated string topicIDs = 4;