From 0ab86de407ffc593fd4aa3503abe14dd13ad1d11 Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Mon, 15 Sep 2014 07:59:02 -0700
Subject: [PATCH] refac(bitswap:exch) HasBlock(ptr) -> HasBlock(val)

---
 bitswap/bitswap.go           | 8 ++++----
 bitswap/interface.go         | 2 +-
 bitswap/offline.go           | 2 +-
 bitswap/offline_test.go      | 2 +-
 blockservice/blockservice.go | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bitswap/bitswap.go b/bitswap/bitswap.go
index 4bdcec06d..f0df93680 100644
--- a/bitswap/bitswap.go
+++ b/bitswap/bitswap.go
@@ -141,7 +141,7 @@ func (bs *BitSwap) getBlock(k u.Key, p *peer.Peer, timeout time.Duration) (*bloc
 
 // HasBlock announces the existance of a block to BitSwap, potentially sending
 // it to peers (Partners) whose WantLists include it.
-func (bs *BitSwap) HasBlock(blk *blocks.Block) error {
+func (bs *BitSwap) HasBlock(blk blocks.Block) error {
 	go func() {
 		for _, ledger := range bs.partners {
 			if ledger.WantListContains(blk.Key()) {
@@ -155,10 +155,10 @@ func (bs *BitSwap) HasBlock(blk *blocks.Block) error {
 	return bs.routing.Provide(blk.Key())
 }
 
-func (bs *BitSwap) SendBlock(p *peer.Peer, b *blocks.Block) {
+func (bs *BitSwap) SendBlock(p *peer.Peer, b blocks.Block) {
 	message := bsmsg.New()
 	// TODO(brian): change interface to accept value instead of pointer
-	message.AppendBlock(*b)
+	message.AppendBlock(b)
 	bs.sender.SendMessage(context.Background(), p, message)
 }
 
@@ -190,7 +190,7 @@ func (bs *BitSwap) peerWantsBlock(p *peer.Peer, wanted u.Key) {
 			u.PErr("newBlock error: %v\n", err)
 			return
 		}
-		bs.SendBlock(p, bblk)
+		bs.SendBlock(p, *bblk)
 		ledger.SentBytes(len(blk))
 	} else {
 		u.DOut("Decided not to send block.")
diff --git a/bitswap/interface.go b/bitswap/interface.go
index 57f24814c..23b669fbd 100644
--- a/bitswap/interface.go
+++ b/bitswap/interface.go
@@ -18,5 +18,5 @@ type Exchange interface {
 	// TODO(brian): accept a value, not a pointer
 	// TODO(brian): remove error return value. Should callers be concerned with
 	// whether the block was made available on the network?
-	HasBlock(*blocks.Block) error
+	HasBlock(blocks.Block) error
 }
diff --git a/bitswap/offline.go b/bitswap/offline.go
index ce889ab26..d1c0fea14 100644
--- a/bitswap/offline.go
+++ b/bitswap/offline.go
@@ -25,6 +25,6 @@ func (_ *offlineExchange) Block(k u.Key, timeout time.Duration) (*blocks.Block,
 }
 
 // HasBlock always returns nil.
-func (_ *offlineExchange) HasBlock(*blocks.Block) error {
+func (_ *offlineExchange) HasBlock(blocks.Block) error {
 	return nil
 }
diff --git a/bitswap/offline_test.go b/bitswap/offline_test.go
index c3d641d0a..2b40ac5e2 100644
--- a/bitswap/offline_test.go
+++ b/bitswap/offline_test.go
@@ -20,7 +20,7 @@ func TestBlockReturnsErr(t *testing.T) {
 func TestHasBlockReturnsNil(t *testing.T) {
 	off := NewOfflineExchange()
 	block := testutil.NewBlockOrFail(t, "data")
-	err := off.HasBlock(&block)
+	err := off.HasBlock(block)
 	if err != nil {
 		t.Fatal("")
 	}
diff --git a/blockservice/blockservice.go b/blockservice/blockservice.go
index 7008a5b2b..0b4f15b98 100644
--- a/blockservice/blockservice.go
+++ b/blockservice/blockservice.go
@@ -42,7 +42,7 @@ func (s *BlockService) AddBlock(b *blocks.Block) (u.Key, error) {
 		return k, err
 	}
 	if s.Remote != nil {
-		err = s.Remote.HasBlock(b)
+		err = s.Remote.HasBlock(*b)
 	}
 	return k, err
 }