Merge pull request #1330 from ipfs/fix/test-deps

fix up some dependencies to avoid circular record deps
ipfs · Jun 3, 2015 · 238fac5 · 238fac5
2 parents 898863d + c2b7456
commit 238fac5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/blockservice/blocks_test.go → blockservice/test/blocks_test.go b/blockservice/blocks_test.go → 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 → blockservice/test/mock.go b/blockservice/mock.go → 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
@@ -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))
  }