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

bitswap: add wantlist fullness to protobuf messages
ipfs · Dec 3, 2016 · 433d0b5 · 433d0b5
2 parents ac16ac5 + 6f8dd03
commit 433d0b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/exchange/bitswap/message/message.go b/exchange/bitswap/message/message.go
@@ -189,6 +189,7 @@ func (m *impl) ToProtoV0() *pb.Message {
 			Cancel:   proto.Bool(e.Cancel),
 		})
 	}
+	pbm.Wantlist.Full = proto.Bool(m.full)
 	for _, b := range m.Blocks() {
 		pbm.Blocks = append(pbm.Blocks, b.RawData())
 	}
@@ -205,6 +206,7 @@ func (m *impl) ToProtoV1() *pb.Message {
 			Cancel:   proto.Bool(e.Cancel),
 		})
 	}
+	pbm.Wantlist.Full = proto.Bool(m.full)
 	for _, b := range m.Blocks() {
 		blk := &pb.Message_Block{
 			Data:   b.RawData(),

diff --git a/exchange/bitswap/message/message_test.go b/exchange/bitswap/message/message_test.go
@@ -118,6 +118,10 @@ func TestToNetFromNetPreservesWantList(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	if !copied.Full() {
+		t.Fatal("fullness attribute got dropped on marshal")
+	}
+
 	keys := make(map[string]bool)
 	for _, k := range copied.Wantlist() {
 		keys[k.Cid.KeyString()] = true