move dagutils package to top level in preparation for merkledag extraction
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Jul 27, 2018 at 13:12 UTC
e78911ce94ef60049f3473654b5a5de3e9023d55
12 files changed
+9
-9
core/commands/object/diff.go
+1
-1
@@ -8,7 +8,7 @@ import (
8
cmds "github.com/ipfs/go-ipfs/commands"
9
core "github.com/ipfs/go-ipfs/core"
10
e "github.com/ipfs/go-ipfs/core/commands/e"
11
- dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
11
+ "github.com/ipfs/go-ipfs/dagutils"
12
path "github.com/ipfs/go-ipfs/path"
13
cmdkit "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
14
)
core/commands/object/patch.go
+1
-1
@@ -10,8 +10,8 @@ import (
10
lgc "github.com/ipfs/go-ipfs/commands/legacy"
11
core "github.com/ipfs/go-ipfs/core"
12
e "github.com/ipfs/go-ipfs/core/commands/e"
13
+ "github.com/ipfs/go-ipfs/dagutils"
14
dag "github.com/ipfs/go-ipfs/merkledag"
14
- dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
15
path "github.com/ipfs/go-ipfs/path"
16
ft "github.com/ipfs/go-ipfs/unixfs"
17
core/coreapi/object.go
+1
-1
@@ -13,8 +13,8 @@ import (
13
14
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
15
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
16
+ "github.com/ipfs/go-ipfs/dagutils"
17
dag "github.com/ipfs/go-ipfs/merkledag"
17
- dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
18
ft "github.com/ipfs/go-ipfs/unixfs"
19
20
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
core/corehttp/gateway_handler.go
+1
-1
@@ -14,9 +14,9 @@ import (
14
15
core "github.com/ipfs/go-ipfs/core"
16
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
17
+ "github.com/ipfs/go-ipfs/dagutils"
18
"github.com/ipfs/go-ipfs/importer"
19
dag "github.com/ipfs/go-ipfs/merkledag"
19
- dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
20
path "github.com/ipfs/go-ipfs/path"
21
resolver "github.com/ipfs/go-ipfs/path/resolver"
22
ft "github.com/ipfs/go-ipfs/unixfs"
dagutils/diff.go
renamed
dagutils/diffenum.go
renamed
dagutils/diffenum_test.go
renamed
dagutils/utils.go
renamed
dagutils/utils_test.go
renamed
pin/pin.go
+2
-2
@@ -9,8 +9,8 @@ import (
9
"sync"
10
"time"
11
12
+ "github.com/ipfs/go-ipfs/dagutils"
13
mdag "github.com/ipfs/go-ipfs/merkledag"
13
- dutils "github.com/ipfs/go-ipfs/merkledag/utils"
14
15
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
16
ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
@@ -518,7 +518,7 @@ func (p *pinner) Update(ctx context.Context, from, to *cid.Cid, unpin bool) erro
518
return fmt.Errorf("'from' cid was not recursively pinned already")
519
}
520
521
- err := dutils.DiffEnumerate(ctx, p.dserv, from, to)
521
+ err := dagutils.DiffEnumerate(ctx, p.dserv, from, to)
522
if err != nil {
523
return err
524
}
tar/format.go
+2
-2
@@ -8,9 +8,9 @@ import (
8
"io"
9
"strings"
10
11
+ "github.com/ipfs/go-ipfs/dagutils"
12
importer "github.com/ipfs/go-ipfs/importer"
13
dag "github.com/ipfs/go-ipfs/merkledag"
13
- dagutil "github.com/ipfs/go-ipfs/merkledag/utils"
14
path "github.com/ipfs/go-ipfs/path"
15
uio "github.com/ipfs/go-ipfs/unixfs/io"
16
@@ -42,7 +42,7 @@ func ImportTar(ctx context.Context, r io.Reader, ds ipld.DAGService) (*dag.Proto
42
root := new(dag.ProtoNode)
43
root.SetData([]byte("ipfs/tar"))
44
45
- e := dagutil.NewDagEditor(root, ds)
45
+ e := dagutils.NewDagEditor(root, ds)
46
47
for {
48
h, err := tr.Next()
unixfs/hamt/hamt_test.go
+1
-1
@@ -9,9 +9,9 @@ import (
9
"testing"
10
"time"
11
12
+ "github.com/ipfs/go-ipfs/dagutils"
13
dag "github.com/ipfs/go-ipfs/merkledag"
14
mdtest "github.com/ipfs/go-ipfs/merkledag/test"
14
- dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
15
ft "github.com/ipfs/go-ipfs/unixfs"
16
17
ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"