style(bitswap/message) rename AppendWanted -> AddWanted
implementation will be patched to ensure bitswap messages cannot contain duplicate blocks or keys
Brian Tiger Chow committed
Oct 27, 2014 at 05:54 UTC
842b910853267a68a5363e70aec99edd2c78669f
4 files changed
+15
-15
exchange/bitswap/bitswap.go
+3
-3
@@ -78,7 +78,7 @@ func (bs *bitswap) Block(parent context.Context, k u.Key) (*blocks.Block, error)
78
go func() {
79
message := bsmsg.New()
80
for _, wanted := range bs.wantlist.Keys() {
81
- message.AppendWanted(wanted)
81
+ message.AddWanted(wanted)
82
}
83
for peerToQuery := range peersToQuery {
84
log.Debugf("bitswap got peersToQuery: %s", peerToQuery)
@@ -167,7 +167,7 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.Peer, incoming bsm
167
168
message := bsmsg.New()
169
for _, wanted := range bs.wantlist.Keys() {
170
- message.AppendWanted(wanted)
170
+ message.AddWanted(wanted)
171
}
172
for _, key := range incoming.Wantlist() {
173
// TODO: might be better to check if we have the block before checking
@@ -208,7 +208,7 @@ func (bs *bitswap) sendToPeersThatWant(ctx context.Context, block blocks.Block)
208
message := bsmsg.New()
209
message.AppendBlock(block)
210
for _, wanted := range bs.wantlist.Keys() {
211
- message.AppendWanted(wanted)
211
+ message.AddWanted(wanted)
212
}
213
go bs.send(ctx, p, message)
214
}
exchange/bitswap/message/message.go
+3
-3
@@ -16,7 +16,7 @@ import (
16
type BitSwapMessage interface {
17
Wantlist() []u.Key
18
Blocks() []blocks.Block
19
- AppendWanted(k u.Key)
19
+ AddWanted(k u.Key)
20
AppendBlock(b blocks.Block)
21
Exportable
22
}
@@ -39,7 +39,7 @@ func New() *message {
39
func newMessageFromProto(pbm pb.Message) BitSwapMessage {
40
m := New()
41
for _, s := range pbm.GetWantlist() {
42
- m.AppendWanted(u.Key(s))
42
+ m.AddWanted(u.Key(s))
43
}
44
for _, d := range pbm.GetBlocks() {
45
b := blocks.NewBlock(d)
@@ -58,7 +58,7 @@ func (m *message) Blocks() []blocks.Block {
58
return m.blocks
59
}
60
61
-func (m *message) AppendWanted(k u.Key) {
61
+func (m *message) AddWanted(k u.Key) {
62
m.wantlist = append(m.wantlist, k)
63
}
64
exchange/bitswap/message/message_test.go
+8
-8
@@ -13,7 +13,7 @@ import (
13
func TestAppendWanted(t *testing.T) {
14
const str = "foo"
15
m := New()
16
- m.AppendWanted(u.Key(str))
16
+ m.AddWanted(u.Key(str))
17
18
if !contains(m.ToProto().GetWantlist(), str) {
19
t.Fail()
@@ -58,7 +58,7 @@ func TestWantlist(t *testing.T) {
58
keystrs := []string{"foo", "bar", "baz", "bat"}
59
m := New()
60
for _, s := range keystrs {
61
- m.AppendWanted(u.Key(s))
61
+ m.AddWanted(u.Key(s))
62
}
63
exported := m.Wantlist()
64
@@ -81,7 +81,7 @@ func TestCopyProtoByValue(t *testing.T) {
81
const str = "foo"
82
m := New()
83
protoBeforeAppend := m.ToProto()
84
- m.AppendWanted(u.Key(str))
84
+ m.AddWanted(u.Key(str))
85
if contains(protoBeforeAppend.GetWantlist(), str) {
86
t.Fail()
87
}
@@ -101,11 +101,11 @@ func TestToNetMethodSetsPeer(t *testing.T) {
101
102
func TestToNetFromNetPreservesWantList(t *testing.T) {
103
original := New()
104
- original.AppendWanted(u.Key("M"))
105
- original.AppendWanted(u.Key("B"))
106
- original.AppendWanted(u.Key("D"))
107
- original.AppendWanted(u.Key("T"))
108
- original.AppendWanted(u.Key("F"))
104
+ original.AddWanted(u.Key("M"))
105
+ original.AddWanted(u.Key("B"))
106
+ original.AddWanted(u.Key("D"))
107
+ original.AddWanted(u.Key("T"))
108
+ original.AddWanted(u.Key("F"))
109
110
p := peer.WithIDString("X")
111
netmsg, err := original.ToNet(p)
exchange/bitswap/strategy/strategy_test.go
+1
-1
@@ -60,7 +60,7 @@ func TestBlockRecordedAsWantedAfterMessageReceived(t *testing.T) {
60
block := blocks.NewBlock([]byte("data wanted by beggar"))
61
62
messageFromBeggarToChooser := message.New()
63
- messageFromBeggarToChooser.AppendWanted(block.Key())
63
+ messageFromBeggarToChooser.AddWanted(block.Key())
64
65
chooser.MessageReceived(beggar.Peer, messageFromBeggarToChooser)
66
// for this test, doesn't matter if you record that beggar sent