fix up some dependencies to avoid circular record deps
Jeromy committed
Jun 3, 2015 at 14:27 UTC
c2b7456b49045e5abda89890f25f61a3c97d05b6
3 files changed
+6
-4
blockservice/test/blocks_test.go
renamed
+2
-1
@@ -1,4 +1,4 @@
1
-package blockservice
1
+package bstest
2
3
import (
4
"bytes"
@@ -12,6 +12,7 @@ import (
12
blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
13
blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
14
key "github.com/ipfs/go-ipfs/blocks/key"
15
+ . "github.com/ipfs/go-ipfs/blockservice"
16
offline "github.com/ipfs/go-ipfs/exchange/offline"
17
u "github.com/ipfs/go-ipfs/util"
18
)
blockservice/test/mock.go
renamed
+2
-1
@@ -1,6 +1,7 @@
1
-package blockservice
1
+package bstest
2
3
import (
4
+ . "github.com/ipfs/go-ipfs/blockservice"
5
bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
6
tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
7
mockrouting "github.com/ipfs/go-ipfs/routing/mock"
merkledag/merkledag_test.go
+2
-2
@@ -13,8 +13,8 @@ import (
13
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
14
bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
15
key "github.com/ipfs/go-ipfs/blocks/key"
16
- blockservice "github.com/ipfs/go-ipfs/blockservice"
16
bserv "github.com/ipfs/go-ipfs/blockservice"
17
+ bstest "github.com/ipfs/go-ipfs/blockservice/test"
18
offline "github.com/ipfs/go-ipfs/exchange/offline"
19
imp "github.com/ipfs/go-ipfs/importer"
20
chunk "github.com/ipfs/go-ipfs/importer/chunk"
@@ -151,7 +151,7 @@ func TestBatchFetchDupBlock(t *testing.T) {
151
152
func runBatchFetchTest(t *testing.T, read io.Reader) {
153
var dagservs []DAGService
154
- for _, bsi := range blockservice.Mocks(t, 5) {
154
+ for _, bsi := range bstest.Mocks(t, 5) {
155
dagservs = append(dagservs, NewDAGService(bsi))
156
}
157