Commit 433d0b5f authored by Jeromy Johnson's avatar Jeromy Johnson Committed by GitHub

Merge pull request #3461 from ipfs/fix/bitswap-message-marshal

bitswap: add wantlist fullness to protobuf messages
parents ac16ac58 6f8dd03e
...@@ -189,6 +189,7 @@ func (m *impl) ToProtoV0() *pb.Message { ...@@ -189,6 +189,7 @@ func (m *impl) ToProtoV0() *pb.Message {
Cancel: proto.Bool(e.Cancel), Cancel: proto.Bool(e.Cancel),
}) })
} }
pbm.Wantlist.Full = proto.Bool(m.full)
for _, b := range m.Blocks() { for _, b := range m.Blocks() {
pbm.Blocks = append(pbm.Blocks, b.RawData()) pbm.Blocks = append(pbm.Blocks, b.RawData())
} }
...@@ -205,6 +206,7 @@ func (m *impl) ToProtoV1() *pb.Message { ...@@ -205,6 +206,7 @@ func (m *impl) ToProtoV1() *pb.Message {
Cancel: proto.Bool(e.Cancel), Cancel: proto.Bool(e.Cancel),
}) })
} }
pbm.Wantlist.Full = proto.Bool(m.full)
for _, b := range m.Blocks() { for _, b := range m.Blocks() {
blk := &pb.Message_Block{ blk := &pb.Message_Block{
Data: b.RawData(), Data: b.RawData(),
......
...@@ -118,6 +118,10 @@ func TestToNetFromNetPreservesWantList(t *testing.T) { ...@@ -118,6 +118,10 @@ func TestToNetFromNetPreservesWantList(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
if !copied.Full() {
t.Fatal("fullness attribute got dropped on marshal")
}
keys := make(map[string]bool) keys := make(map[string]bool)
for _, k := range copied.Wantlist() { for _, k := range copied.Wantlist() {
keys[k.Cid.KeyString()] = true keys[k.Cid.KeyString()] = true
......
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