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

bitswap: add wantlist fullness to protobuf messages
This commit is contained in:
Jeromy Johnson 2016-12-02 16:39:22 -08:00 committed by GitHub
commit 433d0b5fa7
2 changed files with 6 additions and 0 deletions

View File

@ -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(),

View File

@ -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