Commit 25ef943e authored by Jeromy's avatar Jeromy

change from field to bytes to avoid json marshalling corruption

parent a5b52ed0
...@@ -8,7 +8,6 @@ import ( ...@@ -8,7 +8,6 @@ import (
pb "github.com/libp2p/go-floodsub/pb" pb "github.com/libp2p/go-floodsub/pb"
proto "github.com/gogo/protobuf/proto"
logging "github.com/ipfs/go-log" logging "github.com/ipfs/go-log"
host "github.com/libp2p/go-libp2p-host" host "github.com/libp2p/go-libp2p-host"
inet "github.com/libp2p/go-libp2p-net" inet "github.com/libp2p/go-libp2p-net"
...@@ -401,7 +400,7 @@ func (p *PubSub) Publish(topic string, data []byte) error { ...@@ -401,7 +400,7 @@ func (p *PubSub) Publish(topic string, data []byte) error {
&pb.Message{ &pb.Message{
Data: data, Data: data,
TopicIDs: []string{topic}, TopicIDs: []string{topic},
From: proto.String(string(p.host.ID())), From: []byte(p.host.ID()),
Seqno: seqno, Seqno: seqno,
}, },
} }
......
...@@ -145,7 +145,7 @@ func (m *RPC_SubOpts) GetTopicid() string { ...@@ -145,7 +145,7 @@ func (m *RPC_SubOpts) GetTopicid() string {
} }
type Message struct { 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"` Data []byte `protobuf:"bytes,2,opt,name=data" json:"data,omitempty"`
Seqno []byte `protobuf:"bytes,3,opt,name=seqno" json:"seqno,omitempty"` Seqno []byte `protobuf:"bytes,3,opt,name=seqno" json:"seqno,omitempty"`
TopicIDs []string `protobuf:"bytes,4,rep,name=topicIDs" json:"topicIDs,omitempty"` TopicIDs []string `protobuf:"bytes,4,rep,name=topicIDs" json:"topicIDs,omitempty"`
...@@ -156,11 +156,11 @@ func (m *Message) Reset() { *m = Message{} } ...@@ -156,11 +156,11 @@ func (m *Message) Reset() { *m = Message{} }
func (m *Message) String() string { return proto.CompactTextString(m) } func (m *Message) String() string { return proto.CompactTextString(m) }
func (*Message) ProtoMessage() {} func (*Message) ProtoMessage() {}
func (m *Message) GetFrom() string { func (m *Message) GetFrom() []byte {
if m != nil && m.From != nil { if m != nil {
return *m.From return m.From
} }
return "" return nil
} }
func (m *Message) GetData() []byte { func (m *Message) GetData() []byte {
......
...@@ -11,7 +11,7 @@ message RPC { ...@@ -11,7 +11,7 @@ message RPC {
} }
message Message { message Message {
optional string from = 1; optional bytes from = 1;
optional bytes data = 2; optional bytes data = 2;
optional bytes seqno = 3; optional bytes seqno = 3;
repeated string topicIDs = 4; repeated string topicIDs = 4;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment