coreapi: update after rebase
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Jan 31, 2018 at 00:02 UTC
242c98f44f4f8fe80cae1be6597648c478a46ffc
1 file changed
+9
-4
core/coreapi/pin.go
+9
-4
@@ -4,13 +4,16 @@ import (
4
"context"
5
"fmt"
6
7
+ bserv "github.com/ipfs/go-ipfs/blockservice"
8
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
9
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
10
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
11
+ offline "github.com/ipfs/go-ipfs/exchange/offline"
12
merkledag "github.com/ipfs/go-ipfs/merkledag"
13
pin "github.com/ipfs/go-ipfs/pin"
14
13
- cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid"
15
+ cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
16
+ ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
17
)
18
19
type PinAPI struct {
@@ -97,7 +100,9 @@ func (n *badNode) Err() error {
100
101
func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, error) {
102
visited := make(map[string]*pinStatus)
100
- getLinks := api.node.DAG.GetOfflineLinkService().GetLinks
103
+ bs := api.node.Blocks.Blockstore()
104
+ DAG := merkledag.NewDAGService(bserv.New(bs, offline.Exchange(bs)))
105
+ getLinks := merkledag.GetLinksWithDAG(DAG)
106
recPins := api.node.Pinning.RecursiveKeys()
107
108
var checkPin func(root *cid.Cid) *pinStatus
@@ -152,7 +157,7 @@ func (p *pinInfo) Type() string {
157
return p.pinType
158
}
159
155
-func pinLsAll(typeStr string, ctx context.Context, pinning pin.Pinner, dag merkledag.DAGService) ([]coreiface.Pin, error) {
160
+func pinLsAll(typeStr string, ctx context.Context, pinning pin.Pinner, dag ipld.DAGService) ([]coreiface.Pin, error) {
161
162
keys := make(map[string]*pinInfo)
163
@@ -171,7 +176,7 @@ func pinLsAll(typeStr string, ctx context.Context, pinning pin.Pinner, dag merkl
176
if typeStr == "indirect" || typeStr == "all" {
177
set := cid.NewSet()
178
for _, k := range pinning.RecursiveKeys() {
174
- err := merkledag.EnumerateChildren(ctx, dag.GetLinks, k, set.Visit)
179
+ err := merkledag.EnumerateChildren(ctx, merkledag.GetLinksWithDAG(dag), k, set.Visit)
180
if err != nil {
181
return nil, err
182
}