From 842b910853267a68a5363e70aec99edd2c78669f Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Mon, 27 Oct 2014 05:54:50 -0700
Subject: [PATCH] style(bitswap/message) rename AppendWanted -> AddWanted

implementation will be patched to ensure bitswap messages cannot contain
duplicate blocks or keys
---
 exchange/bitswap/bitswap.go                |  6 +++---
 exchange/bitswap/message/message.go        |  6 +++---
 exchange/bitswap/message/message_test.go   | 16 ++++++++--------
 exchange/bitswap/strategy/strategy_test.go |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/exchange/bitswap/bitswap.go b/exchange/bitswap/bitswap.go
index 9e1948030..ec004da43 100644
--- a/exchange/bitswap/bitswap.go
+++ b/exchange/bitswap/bitswap.go
@@ -78,7 +78,7 @@ func (bs *bitswap) Block(parent context.Context, k u.Key) (*blocks.Block, error)
 	go func() {
 		message := bsmsg.New()
 		for _, wanted := range bs.wantlist.Keys() {
-			message.AppendWanted(wanted)
+			message.AddWanted(wanted)
 		}
 		for peerToQuery := range peersToQuery {
 			log.Debugf("bitswap got peersToQuery: %s", peerToQuery)
@@ -167,7 +167,7 @@ func (bs *bitswap) ReceiveMessage(ctx context.Context, p peer.Peer, incoming bsm
 
 	message := bsmsg.New()
 	for _, wanted := range bs.wantlist.Keys() {
-		message.AppendWanted(wanted)
+		message.AddWanted(wanted)
 	}
 	for _, key := range incoming.Wantlist() {
 		// 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)
 				message := bsmsg.New()
 				message.AppendBlock(block)
 				for _, wanted := range bs.wantlist.Keys() {
-					message.AppendWanted(wanted)
+					message.AddWanted(wanted)
 				}
 				go bs.send(ctx, p, message)
 			}
diff --git a/exchange/bitswap/message/message.go b/exchange/bitswap/message/message.go
index b7216b024..d2ebd74b3 100644
--- a/exchange/bitswap/message/message.go
+++ b/exchange/bitswap/message/message.go
@@ -16,7 +16,7 @@ import (
 type BitSwapMessage interface {
 	Wantlist() []u.Key
 	Blocks() []blocks.Block
-	AppendWanted(k u.Key)
+	AddWanted(k u.Key)
 	AppendBlock(b blocks.Block)
 	Exportable
 }
@@ -39,7 +39,7 @@ func New() *message {
 func newMessageFromProto(pbm pb.Message) BitSwapMessage {
 	m := New()
 	for _, s := range pbm.GetWantlist() {
-		m.AppendWanted(u.Key(s))
+		m.AddWanted(u.Key(s))
 	}
 	for _, d := range pbm.GetBlocks() {
 		b := blocks.NewBlock(d)
@@ -58,7 +58,7 @@ func (m *message) Blocks() []blocks.Block {
 	return m.blocks
 }
 
-func (m *message) AppendWanted(k u.Key) {
+func (m *message) AddWanted(k u.Key) {
 	m.wantlist = append(m.wantlist, k)
 }
 
diff --git a/exchange/bitswap/message/message_test.go b/exchange/bitswap/message/message_test.go
index 932c14e9b..4b385791c 100644
--- a/exchange/bitswap/message/message_test.go
+++ b/exchange/bitswap/message/message_test.go
@@ -13,7 +13,7 @@ import (
 func TestAppendWanted(t *testing.T) {
 	const str = "foo"
 	m := New()
-	m.AppendWanted(u.Key(str))
+	m.AddWanted(u.Key(str))
 
 	if !contains(m.ToProto().GetWantlist(), str) {
 		t.Fail()
@@ -58,7 +58,7 @@ func TestWantlist(t *testing.T) {
 	keystrs := []string{"foo", "bar", "baz", "bat"}
 	m := New()
 	for _, s := range keystrs {
-		m.AppendWanted(u.Key(s))
+		m.AddWanted(u.Key(s))
 	}
 	exported := m.Wantlist()
 
@@ -81,7 +81,7 @@ func TestCopyProtoByValue(t *testing.T) {
 	const str = "foo"
 	m := New()
 	protoBeforeAppend := m.ToProto()
-	m.AppendWanted(u.Key(str))
+	m.AddWanted(u.Key(str))
 	if contains(protoBeforeAppend.GetWantlist(), str) {
 		t.Fail()
 	}
@@ -101,11 +101,11 @@ func TestToNetMethodSetsPeer(t *testing.T) {
 
 func TestToNetFromNetPreservesWantList(t *testing.T) {
 	original := New()
-	original.AppendWanted(u.Key("M"))
-	original.AppendWanted(u.Key("B"))
-	original.AppendWanted(u.Key("D"))
-	original.AppendWanted(u.Key("T"))
-	original.AppendWanted(u.Key("F"))
+	original.AddWanted(u.Key("M"))
+	original.AddWanted(u.Key("B"))
+	original.AddWanted(u.Key("D"))
+	original.AddWanted(u.Key("T"))
+	original.AddWanted(u.Key("F"))
 
 	p := peer.WithIDString("X")
 	netmsg, err := original.ToNet(p)
diff --git a/exchange/bitswap/strategy/strategy_test.go b/exchange/bitswap/strategy/strategy_test.go
index e3ffc05ea..5fc7efb0a 100644
--- a/exchange/bitswap/strategy/strategy_test.go
+++ b/exchange/bitswap/strategy/strategy_test.go
@@ -60,7 +60,7 @@ func TestBlockRecordedAsWantedAfterMessageReceived(t *testing.T) {
 	block := blocks.NewBlock([]byte("data wanted by beggar"))
 
 	messageFromBeggarToChooser := message.New()
-	messageFromBeggarToChooser.AppendWanted(block.Key())
+	messageFromBeggarToChooser.AddWanted(block.Key())
 
 	chooser.MessageReceived(beggar.Peer, messageFromBeggarToChooser)
 	// for this test, doesn't matter if you record that beggar sent