Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-dms3
Commits
433d0b5f
Commit
433d0b5f
authored
Dec 02, 2016
by
Jeromy Johnson
Committed by
GitHub
Dec 02, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3461 from ipfs/fix/bitswap-message-marshal
bitswap: add wantlist fullness to protobuf messages
parents
ac16ac58
6f8dd03e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
exchange/bitswap/message/message.go
exchange/bitswap/message/message.go
+2
-0
exchange/bitswap/message/message_test.go
exchange/bitswap/message/message_test.go
+4
-0
No files found.
exchange/bitswap/message/message.go
View file @
433d0b5f
...
...
@@ -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
(),
...
...
exchange/bitswap/message/message_test.go
View file @
433d0b5f
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment