fix tests (circular import)
Juan Batiz-Benet committed
Oct 30, 2014 at 01:17 UTC
f0d823c2dbe8de23da3ad2e6594ae0b2b23fdc7b
2 files changed
+10
-9
core/core.go
+2
-2
@@ -161,8 +161,8 @@ func NewIpfsNode(cfg *config.Config, online bool) (n *IpfsNode, err error) {
161
if err != nil {
162
n.Pinning = pin.NewPinner(n.Datastore, n.DAG)
163
}
164
- n.Resolver = &path.Resolver{DAG: n.DAG}
165
-
164
+ n.Resolver = &path.Resolver{DAG: n.DAG}
165
+
166
success = true
167
return n, nil
168
}
unixfs/io/dagwriter_test.go
+8
-7
@@ -1,4 +1,4 @@
1
-package io
1
+package io_test
2
3
import (
4
"testing"
@@ -7,9 +7,10 @@ import (
7
8
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
9
bs "github.com/jbenet/go-ipfs/blockservice"
10
- "github.com/jbenet/go-ipfs/importer"
10
+ importer "github.com/jbenet/go-ipfs/importer"
11
chunk "github.com/jbenet/go-ipfs/importer/chunk"
12
mdag "github.com/jbenet/go-ipfs/merkledag"
13
+ dagio "github.com/jbenet/go-ipfs/unixfs/io"
14
)
15
16
type datasource struct {
@@ -55,7 +56,7 @@ func TestDagWriter(t *testing.T) {
56
t.Fatal(err)
57
}
58
dag := mdag.NewDAGService(bserv)
58
- dw := NewDagWriter(dag, &chunk.SizeSplitter{Size: 4096})
59
+ dw := dagio.NewDagWriter(dag, &chunk.SizeSplitter{Size: 4096})
60
61
nbytes := int64(1024 * 1024 * 2)
62
n, err := io.CopyN(dw, &datasource{}, nbytes)
@@ -70,7 +71,7 @@ func TestDagWriter(t *testing.T) {
71
dw.Close()
72
73
node := dw.GetNode()
73
- read, err := NewDagReader(node, dag)
74
+ read, err := dagio.NewDagReader(node, dag)
75
if err != nil {
76
t.Fatal(err)
77
}
@@ -89,7 +90,7 @@ func TestMassiveWrite(t *testing.T) {
90
t.Fatal(err)
91
}
92
dag := mdag.NewDAGService(bserv)
92
- dw := NewDagWriter(dag, &chunk.SizeSplitter{Size: 4096})
93
+ dw := dagio.NewDagWriter(dag, &chunk.SizeSplitter{Size: 4096})
94
95
nbytes := int64(1024 * 1024 * 1024 * 16)
96
n, err := io.CopyN(dw, &datasource{}, nbytes)
@@ -114,7 +115,7 @@ func BenchmarkDagWriter(b *testing.B) {
115
nbytes := int64(100000)
116
for i := 0; i < b.N; i++ {
117
b.SetBytes(nbytes)
117
- dw := NewDagWriter(dag, &chunk.SizeSplitter{Size: 4096})
118
+ dw := dagio.NewDagWriter(dag, &chunk.SizeSplitter{Size: 4096})
119
n, err := io.CopyN(dw, &datasource{}, nbytes)
120
if err != nil {
121
b.Fatal(err)
@@ -138,7 +139,7 @@ func TestAgainstImporter(t *testing.T) {
139
nbytes := int64(1024 * 1024 * 2)
140
141
// DagWriter
141
- dw := NewDagWriter(dag, &chunk.SizeSplitter{4096})
142
+ dw := dagio.NewDagWriter(dag, &chunk.SizeSplitter{4096})
143
n, err := io.CopyN(dw, &datasource{}, nbytes)
144
if err != nil {
145
t.Fatal(err)