From c2b7456b49045e5abda89890f25f61a3c97d05b6 Mon Sep 17 00:00:00 2001
From: Jeromy <jeromyj@gmail.com>
Date: Wed, 3 Jun 2015 14:27:31 -0700
Subject: [PATCH] fix up some dependencies to avoid circular record deps

---
 blockservice/{ => test}/blocks_test.go | 3 ++-
 blockservice/{ => test}/mock.go        | 3 ++-
 merkledag/merkledag_test.go            | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename blockservice/{ => test}/blocks_test.go (97%)
 rename blockservice/{ => test}/mock.go (92%)

diff --git a/blockservice/blocks_test.go b/blockservice/test/blocks_test.go
similarity index 97%
rename from blockservice/blocks_test.go
rename to blockservice/test/blocks_test.go
index a703cfc72..cb7f665ac 100644
--- a/blockservice/blocks_test.go
+++ b/blockservice/test/blocks_test.go
@@ -1,4 +1,4 @@
-package blockservice
+package bstest
 
 import (
 	"bytes"
@@ -12,6 +12,7 @@ import (
 	blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
 	blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
 	key "github.com/ipfs/go-ipfs/blocks/key"
+	. "github.com/ipfs/go-ipfs/blockservice"
 	offline "github.com/ipfs/go-ipfs/exchange/offline"
 	u "github.com/ipfs/go-ipfs/util"
 )
diff --git a/blockservice/mock.go b/blockservice/test/mock.go
similarity index 92%
rename from blockservice/mock.go
rename to blockservice/test/mock.go
index 293d11f16..4c4009de2 100644
--- a/blockservice/mock.go
+++ b/blockservice/test/mock.go
@@ -1,6 +1,7 @@
-package blockservice
+package bstest
 
 import (
+	. "github.com/ipfs/go-ipfs/blockservice"
 	bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
 	tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
 	mockrouting "github.com/ipfs/go-ipfs/routing/mock"
diff --git a/merkledag/merkledag_test.go b/merkledag/merkledag_test.go
index 795cce2f6..8ab41ca87 100644
--- a/merkledag/merkledag_test.go
+++ b/merkledag/merkledag_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 	bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
 	key "github.com/ipfs/go-ipfs/blocks/key"
-	blockservice "github.com/ipfs/go-ipfs/blockservice"
 	bserv "github.com/ipfs/go-ipfs/blockservice"
+	bstest "github.com/ipfs/go-ipfs/blockservice/test"
 	offline "github.com/ipfs/go-ipfs/exchange/offline"
 	imp "github.com/ipfs/go-ipfs/importer"
 	chunk "github.com/ipfs/go-ipfs/importer/chunk"
@@ -151,7 +151,7 @@ func TestBatchFetchDupBlock(t *testing.T) {
 
 func runBatchFetchTest(t *testing.T, read io.Reader) {
 	var dagservs []DAGService
-	for _, bsi := range blockservice.Mocks(t, 5) {
+	for _, bsi := range bstest.Mocks(t, 5) {
 		dagservs = append(dagservs, NewDAGService(bsi))
 	}