refac(bitswap:message) accept block by value
Brian Tiger Chow committed
Sep 15, 2014 at 07:47 UTC
e07d3418c4f2df0730f27e1ccd3d8de73b303b64
3 files changed
+6
-8
bitswap/bitswap.go
+2
-1
@@ -157,7 +157,8 @@ func (bs *BitSwap) HasBlock(blk *blocks.Block) error {
157
158
func (bs *BitSwap) SendBlock(p *peer.Peer, b *blocks.Block) {
159
message := bsmsg.New()
160
- message.AppendBlock(b)
160
+ // TODO(brian): change interface to accept value instead of pointer
161
+ message.AppendBlock(*b)
162
bs.sender.SendMessage(context.Background(), p, message)
163
}
164
bitswap/message/message.go
+2
-2
@@ -15,7 +15,7 @@ type BitSwapMessage interface {
15
Wantlist() []u.Key
16
Blocks() []blocks.Block
17
AppendWanted(k u.Key)
18
- AppendBlock(b *blocks.Block)
18
+ AppendBlock(b blocks.Block)
19
Exportable
20
}
21
@@ -63,7 +63,7 @@ func (m *message) AppendWanted(k u.Key) {
63
m.pb.Wantlist = append(m.pb.Wantlist, string(k))
64
}
65
66
-func (m *message) AppendBlock(b *blocks.Block) {
66
+func (m *message) AppendBlock(b blocks.Block) {
67
m.pb.Blocks = append(m.pb.Blocks, b.Data)
68
}
69
bitswap/message/message_test.go
+2
-5
@@ -4,8 +4,8 @@ import (
4
"bytes"
5
"testing"
6
7
- blocks "github.com/jbenet/go-ipfs/blocks"
7
u "github.com/jbenet/go-ipfs/util"
8
+ testutil "github.com/jbenet/go-ipfs/util/testutil"
9
)
10
11
func TestAppendWanted(t *testing.T) {
@@ -39,10 +39,7 @@ func TestAppendBlock(t *testing.T) {
39
40
m := New()
41
for _, str := range strs {
42
- block, err := blocks.NewBlock([]byte(str))
43
- if err != nil {
44
- t.Fail()
45
- }
42
+ block := testutil.NewBlockOrFail(t, str)
43
m.AppendBlock(block)
44
}
45