Skip to content

Commit dc1100d

Browse files
whyrusleepingwhyrusleeping
authored
Merge pull request #5298 from ipfs/feat/extract-dagservice
Extract merkledag package, move dagutils to top level
2 parents 23f9e7b + 28fdee7 commit dc1100d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+87
-4125
lines changed

‎Rules.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ endif
5050
dir := unixfs/pb
5151
include $(dir)/Rules.mk
5252

53-
dir := merkledag/pb
54-
include $(dir)/Rules.mk
55-
5653
dir := pin/internal/pb
5754
include $(dir)/Rules.mk
5855

‎core/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import (
1010
"time"
1111

1212
filestore "github.com/ipfs/go-ipfs/filestore"
13-
dag "github.com/ipfs/go-ipfs/merkledag"
1413
resolver "github.com/ipfs/go-ipfs/path/resolver"
1514
pin "github.com/ipfs/go-ipfs/pin"
1615
repo "github.com/ipfs/go-ipfs/repo"
1716
cfg "github.com/ipfs/go-ipfs/repo/config"
1817
"github.com/ipfs/go-ipfs/thirdparty/verifbs"
1918
uio "github.com/ipfs/go-ipfs/unixfs/io"
2019
bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
20+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2121

2222
offline "gx/ipfs/QmS6mo1dPpHdYsVkm27BRZDLxpKBCiJKUH8fHX15XFfMez/go-ipfs-exchange-offline"
2323
goprocessctx "gx/ipfs/QmSF8fPo3jgVBAy8fpdjjYqgG87dkJgUprRBHRd2tmfgpP/goprocess/context"

‎core/commands/add.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
core "github.com/ipfs/go-ipfs/core"
1111
"github.com/ipfs/go-ipfs/core/coreunix"
1212
filestore "github.com/ipfs/go-ipfs/filestore"
13-
dag "github.com/ipfs/go-ipfs/merkledag"
14-
dagtest "github.com/ipfs/go-ipfs/merkledag/test"
1513
mfs "github.com/ipfs/go-ipfs/mfs"
1614
ft "github.com/ipfs/go-ipfs/unixfs"
1715
blockservice "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
16+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
17+
dagtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
1818

1919
cmds "gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
2020
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"

‎core/commands/dht.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
cmds "github.com/ipfs/go-ipfs/commands"
1212
e "github.com/ipfs/go-ipfs/core/commands/e"
13-
dag "github.com/ipfs/go-ipfs/merkledag"
1413
path "github.com/ipfs/go-ipfs/path"
14+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1515

1616
b58 "gx/ipfs/QmWFAMPqsEyUX7gDUsRVmMWz59FxSpJ1b2v6bJ1yYzo7jY/go-base58-fast/base58"
1717
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"

‎core/commands/files.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import (
1515
lgc "github.com/ipfs/go-ipfs/commands/legacy"
1616
core "github.com/ipfs/go-ipfs/core"
1717
e "github.com/ipfs/go-ipfs/core/commands/e"
18-
dag "github.com/ipfs/go-ipfs/merkledag"
1918
mfs "github.com/ipfs/go-ipfs/mfs"
2019
path "github.com/ipfs/go-ipfs/path"
2120
resolver "github.com/ipfs/go-ipfs/path/resolver"
2221
ft "github.com/ipfs/go-ipfs/unixfs"
2322
uio "github.com/ipfs/go-ipfs/unixfs/io"
2423
bservice "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
24+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2525

2626
cmds "gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
2727
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"

‎core/commands/get.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111

1212
core "github.com/ipfs/go-ipfs/core"
1313
e "github.com/ipfs/go-ipfs/core/commands/e"
14-
dag "github.com/ipfs/go-ipfs/merkledag"
1514
path "github.com/ipfs/go-ipfs/path"
1615
uarchive "github.com/ipfs/go-ipfs/unixfs/archive"
16+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1717

1818
"gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
1919
"gx/ipfs/QmPtj12fdwuAqj9sBSTNUxBNu8kCGNp8b3o8yUzMm5GHpq/pb"

‎core/commands/ls.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
cmds "github.com/ipfs/go-ipfs/commands"
1010
core "github.com/ipfs/go-ipfs/core"
1111
e "github.com/ipfs/go-ipfs/core/commands/e"
12-
merkledag "github.com/ipfs/go-ipfs/merkledag"
1312
path "github.com/ipfs/go-ipfs/path"
1413
resolver "github.com/ipfs/go-ipfs/path/resolver"
1514
unixfs "github.com/ipfs/go-ipfs/unixfs"
1615
uio "github.com/ipfs/go-ipfs/unixfs/io"
1716
unixfspb "github.com/ipfs/go-ipfs/unixfs/pb"
1817
blockservice "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
18+
merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1919

2020
offline "gx/ipfs/QmS6mo1dPpHdYsVkm27BRZDLxpKBCiJKUH8fHX15XFfMez/go-ipfs-exchange-offline"
2121
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"

‎core/commands/object/diff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
cmds "github.com/ipfs/go-ipfs/commands"
99
core "github.com/ipfs/go-ipfs/core"
1010
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"
1212
path "github.com/ipfs/go-ipfs/path"
1313
cmdkit "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
1414
)

‎core/commands/object/object.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ import (
1717
lgc "github.com/ipfs/go-ipfs/commands/legacy"
1818
core "github.com/ipfs/go-ipfs/core"
1919
e "github.com/ipfs/go-ipfs/core/commands/e"
20-
dag "github.com/ipfs/go-ipfs/merkledag"
2120
path "github.com/ipfs/go-ipfs/path"
2221
pin "github.com/ipfs/go-ipfs/pin"
2322
ft "github.com/ipfs/go-ipfs/unixfs"
23+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2424

2525
cmds "gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
2626
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"

‎core/commands/object/patch.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
lgc "github.com/ipfs/go-ipfs/commands/legacy"
1111
core "github.com/ipfs/go-ipfs/core"
1212
e "github.com/ipfs/go-ipfs/core/commands/e"
13-
dag "github.com/ipfs/go-ipfs/merkledag"
14-
dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
13+
"github.com/ipfs/go-ipfs/dagutils"
1514
path "github.com/ipfs/go-ipfs/path"
1615
ft "github.com/ipfs/go-ipfs/unixfs"
16+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1717

1818
cmds "gx/ipfs/QmNueRyPRQiV7PUEpnP4GgGLuK1rKQLaRW7sfPvUetYig1/go-ipfs-cmds"
1919
logging "gx/ipfs/QmcVVHfdyv15GVPk7NrxdWjh2hLVccXnoD8j2tyQShiXJb/go-log"

‎core/commands/pin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
core "github.com/ipfs/go-ipfs/core"
1212
e "github.com/ipfs/go-ipfs/core/commands/e"
1313
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
14-
dag "github.com/ipfs/go-ipfs/merkledag"
1514
path "github.com/ipfs/go-ipfs/path"
1615
resolver "github.com/ipfs/go-ipfs/path/resolver"
1716
pin "github.com/ipfs/go-ipfs/pin"
1817
uio "github.com/ipfs/go-ipfs/unixfs/io"
1918
bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
19+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2020

2121
u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
2222
"gx/ipfs/QmQwgv79RHrRnoXmhnpC1BPtY55HHeneGMpPwmmBU1fUAG/go-verifcid"

‎core/commands/tar.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
core "github.com/ipfs/go-ipfs/core"
99
e "github.com/ipfs/go-ipfs/core/commands/e"
1010
"github.com/ipfs/go-ipfs/core/coreunix"
11-
dag "github.com/ipfs/go-ipfs/merkledag"
1211
path "github.com/ipfs/go-ipfs/path"
1312
tar "github.com/ipfs/go-ipfs/tar"
13+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1414

1515
"gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
1616
)

‎core/commands/unixfs/ls.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212
cmds "github.com/ipfs/go-ipfs/commands"
1313
core "github.com/ipfs/go-ipfs/core"
1414
e "github.com/ipfs/go-ipfs/core/commands/e"
15-
merkledag "github.com/ipfs/go-ipfs/merkledag"
1615
path "github.com/ipfs/go-ipfs/path"
1716
resolver "github.com/ipfs/go-ipfs/path/resolver"
1817
unixfs "github.com/ipfs/go-ipfs/unixfs"
1918
uio "github.com/ipfs/go-ipfs/unixfs/io"
2019
unixfspb "github.com/ipfs/go-ipfs/unixfs/pb"
20+
merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2121
)
2222

2323
type LsLink struct {

‎core/core.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
rp "github.com/ipfs/go-ipfs/exchange/reprovide"
2424
filestore "github.com/ipfs/go-ipfs/filestore"
2525
mount "github.com/ipfs/go-ipfs/fuse/mount"
26-
merkledag "github.com/ipfs/go-ipfs/merkledag"
2726
mfs "github.com/ipfs/go-ipfs/mfs"
2827
namesys "github.com/ipfs/go-ipfs/namesys"
2928
ipnsrp "github.com/ipfs/go-ipfs/namesys/republisher"
@@ -34,6 +33,7 @@ import (
3433
config "github.com/ipfs/go-ipfs/repo/config"
3534
ft "github.com/ipfs/go-ipfs/unixfs"
3635
bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
36+
merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
3737
bitswap "gx/ipfs/QmSLYFS88MpPsszqWdhGSxvHyoTnmaU4A74SD6KGib6Z3m/go-bitswap"
3838
bsnet "gx/ipfs/QmSLYFS88MpPsszqWdhGSxvHyoTnmaU4A74SD6KGib6Z3m/go-bitswap/network"
3939

‎core/coreapi/object.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
1515
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
16-
dag "github.com/ipfs/go-ipfs/merkledag"
17-
dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
16+
"github.com/ipfs/go-ipfs/dagutils"
1817
ft "github.com/ipfs/go-ipfs/unixfs"
18+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1919

2020
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
2121
ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"

‎core/coreapi/pin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
88
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
99
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
10-
merkledag "github.com/ipfs/go-ipfs/merkledag"
1110
bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
11+
merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1212

1313
offline "gx/ipfs/QmS6mo1dPpHdYsVkm27BRZDLxpKBCiJKUH8fHX15XFfMez/go-ipfs-exchange-offline"
1414
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"

‎core/coreapi/unixfs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
options "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
1616
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
1717
keystore "github.com/ipfs/go-ipfs/keystore"
18-
mdag "github.com/ipfs/go-ipfs/merkledag"
1918
repo "github.com/ipfs/go-ipfs/repo"
2019
config "github.com/ipfs/go-ipfs/repo/config"
2120
unixfs "github.com/ipfs/go-ipfs/unixfs"
21+
mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2222

2323
cbor "gx/ipfs/QmWrbExtUaQQHjJ8FVVDAWj5o1MRAELDUV3VmoQsZHHb6L/go-ipld-cbor"
2424
peer "gx/ipfs/QmdVrMn1LhB4ybb8hMVaMLXnA8XRSewMnK6YqXKXoTcRvN/go-libp2p-peer"

‎core/coredag/dagpb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"io/ioutil"
66
"math"
77

8-
"github.com/ipfs/go-ipfs/merkledag"
8+
"gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
99

1010
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
1111
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"

‎core/coredag/raw.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"io/ioutil"
66
"math"
77

8-
"github.com/ipfs/go-ipfs/merkledag"
8+
"gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
99

1010
mh "gx/ipfs/QmPnFwZ2JXKnXgMw8CdBPxn7FWh6LLdjUjxV1fKHuJnkr8/go-multihash"
1111
block "gx/ipfs/QmVzK524a2VWLqyvtBeiHKsUAWYgeAk4DBeZoY7vpNPNRx/go-block-format"

‎core/corehttp/gateway_handler.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ import (
1414

1515
core "github.com/ipfs/go-ipfs/core"
1616
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
17+
"github.com/ipfs/go-ipfs/dagutils"
1718
"github.com/ipfs/go-ipfs/importer"
18-
dag "github.com/ipfs/go-ipfs/merkledag"
19-
dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
2019
path "github.com/ipfs/go-ipfs/path"
2120
resolver "github.com/ipfs/go-ipfs/path/resolver"
2221
ft "github.com/ipfs/go-ipfs/unixfs"
2322
uio "github.com/ipfs/go-ipfs/unixfs/io"
23+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2424

2525
humanize "gx/ipfs/QmPSBJL4momYnE7DcUyk2DVhD6rH488ZmHBGLbxNdhU44K/go-humanize"
2626
chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"

‎core/corehttp/gateway_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import (
1313

1414
core "github.com/ipfs/go-ipfs/core"
1515
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
16-
dag "github.com/ipfs/go-ipfs/merkledag"
1716
namesys "github.com/ipfs/go-ipfs/namesys"
1817
nsopts "github.com/ipfs/go-ipfs/namesys/opts"
1918
path "github.com/ipfs/go-ipfs/path"
2019
repo "github.com/ipfs/go-ipfs/repo"
2120
config "github.com/ipfs/go-ipfs/repo/config"
21+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2222

2323
id "gx/ipfs/QmY51bqSM5XgxQZqsBrQcRkKTnCb8EKpJpR9K6Qax7Njco/go-libp2p/p2p/protocol/identify"
2424
ci "gx/ipfs/Qme1knMqwt1hKZbc1BmQFmnm9f36nyQGwXxPGVpVJ9rMK5/go-libp2p-crypto"

‎core/coreunix/add.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
balanced "github.com/ipfs/go-ipfs/importer/balanced"
1515
ihelper "github.com/ipfs/go-ipfs/importer/helpers"
1616
trickle "github.com/ipfs/go-ipfs/importer/trickle"
17-
dag "github.com/ipfs/go-ipfs/merkledag"
1817
mfs "github.com/ipfs/go-ipfs/mfs"
1918
"github.com/ipfs/go-ipfs/pin"
2019
unixfs "github.com/ipfs/go-ipfs/unixfs"
20+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2121

2222
posinfo "gx/ipfs/QmSHjPDw8yNgLZ7cBfX7w3Smn7PHwYhNEpd4LHQQxUg35L/go-ipfs-posinfo"
2323
chunker "gx/ipfs/QmVDjhUMtkRskBFAVNwyXuLSKbeAya7JKPnzAxMKDaK4x4/go-ipfs-chunker"

‎core/coreunix/add_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"time"
1212

1313
"github.com/ipfs/go-ipfs/core"
14-
dag "github.com/ipfs/go-ipfs/merkledag"
1514
"github.com/ipfs/go-ipfs/pin/gc"
1615
"github.com/ipfs/go-ipfs/repo"
1716
"github.com/ipfs/go-ipfs/repo/config"
1817
"gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
18+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1919

2020
pi "gx/ipfs/QmSHjPDw8yNgLZ7cBfX7w3Smn7PHwYhNEpd4LHQQxUg35L/go-ipfs-posinfo"
2121
blocks "gx/ipfs/QmVzK524a2VWLqyvtBeiHKsUAWYgeAk4DBeZoY7vpNPNRx/go-block-format"

‎core/coreunix/metadata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package coreunix
22

33
import (
44
core "github.com/ipfs/go-ipfs/core"
5-
dag "github.com/ipfs/go-ipfs/merkledag"
65
ft "github.com/ipfs/go-ipfs/unixfs"
6+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
77
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
88
)
99

‎core/coreunix/metadata_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88

99
core "github.com/ipfs/go-ipfs/core"
1010
importer "github.com/ipfs/go-ipfs/importer"
11-
merkledag "github.com/ipfs/go-ipfs/merkledag"
1211
ft "github.com/ipfs/go-ipfs/unixfs"
1312
uio "github.com/ipfs/go-ipfs/unixfs/io"
1413
bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
14+
merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1515

1616
u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
1717
offline "gx/ipfs/QmS6mo1dPpHdYsVkm27BRZDLxpKBCiJKUH8fHX15XFfMez/go-ipfs-exchange-offline"

‎merkledag/utils/diff.go renamed to ‎dagutils/diff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"path"
77

8-
dag "github.com/ipfs/go-ipfs/merkledag"
8+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
99

1010
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
1111
ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"

‎merkledag/utils/diffenum.go renamed to ‎dagutils/diffenum.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
mdag "github.com/ipfs/go-ipfs/merkledag"
7+
mdag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
88

99
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
1010
ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"

‎merkledag/utils/diffenum_test.go renamed to ‎dagutils/diffenum_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"testing"
77

8-
dag "github.com/ipfs/go-ipfs/merkledag"
9-
mdtest "github.com/ipfs/go-ipfs/merkledag/test"
8+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
9+
mdtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
1010

1111
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
1212
ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"

‎merkledag/utils/utils.go renamed to ‎dagutils/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"errors"
66

7-
dag "github.com/ipfs/go-ipfs/merkledag"
87
path "github.com/ipfs/go-ipfs/path"
98
bserv "gx/ipfs/QmNqRBAhovtf4jVd5cF7YvHaFSsQHHZBaUFwGQWPM2CV7R/go-blockservice"
9+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1010

1111
offline "gx/ipfs/QmS6mo1dPpHdYsVkm27BRZDLxpKBCiJKUH8fHX15XFfMez/go-ipfs-exchange-offline"
1212
ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"

‎merkledag/utils/utils_test.go renamed to ‎dagutils/utils_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"testing"
66

7-
dag "github.com/ipfs/go-ipfs/merkledag"
8-
mdtest "github.com/ipfs/go-ipfs/merkledag/test"
97
path "github.com/ipfs/go-ipfs/path"
8+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
9+
mdtest "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag/test"
1010

1111
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
1212
ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"

‎exchange/reprovide/providers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package reprovide
33
import (
44
"context"
55

6-
merkledag "github.com/ipfs/go-ipfs/merkledag"
76
pin "github.com/ipfs/go-ipfs/pin"
87

8+
merkledag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
99
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
1010
ipld "gx/ipfs/QmZtNq8dArGfnpCZfx2pUNY7UcjGhVp5qqwQ4hH6mpTMRQ/go-ipld-format"
1111
blocks "gx/ipfs/QmadMhXJLHMFjpRmh85XjpmVDkEtQpNYEZNRpWRvYVLrvb/go-ipfs-blockstore"

‎filestore/filestore_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"math/rand"
88
"testing"
99

10-
dag "github.com/ipfs/go-ipfs/merkledag"
10+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
1111

1212
posinfo "gx/ipfs/QmSHjPDw8yNgLZ7cBfX7w3Smn7PHwYhNEpd4LHQQxUg35L/go-ipfs-posinfo"
1313
cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"

‎fuse/ipns/ipns_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"os"
1313

1414
core "github.com/ipfs/go-ipfs/core"
15-
dag "github.com/ipfs/go-ipfs/merkledag"
1615
mfs "github.com/ipfs/go-ipfs/mfs"
1716
namesys "github.com/ipfs/go-ipfs/namesys"
1817
path "github.com/ipfs/go-ipfs/path"
1918
ft "github.com/ipfs/go-ipfs/unixfs"
19+
dag "gx/ipfs/QmRy4Qk9hbgFX9NGJRm8rBThrA8PZhNCitMgeRYyZ67s59/go-merkledag"
2020

2121
fuse "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse"
2222
fs "gx/ipfs/QmSJBsmLP1XMjv8hxYg2rUMdPDB7YUpyBo9idjrJ6Cmq6F/fuse/fs"

0 commit comments

Comments
 (0)