opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-05-22 01:17:11 +08:00
Code Issues Projects Releases Wiki Activity

coreapi: update after rebase

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2018-01-31 00:02:52 +01:00
parent 5ea9a3cde2
commit 242c98f44f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/coreapi/pin.go
View File

@ -4,13 +4,16 @@ import (
"context" "context"
"fmt" "fmt"
bserv "github.com/ipfs/go-ipfs/blockservice"
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options" caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
corerepo "github.com/ipfs/go-ipfs/core/corerepo" corerepo "github.com/ipfs/go-ipfs/core/corerepo"
offline "github.com/ipfs/go-ipfs/exchange/offline"
merkledag "github.com/ipfs/go-ipfs/merkledag" merkledag "github.com/ipfs/go-ipfs/merkledag"
pin "github.com/ipfs/go-ipfs/pin" pin "github.com/ipfs/go-ipfs/pin"
cid "gx/ipfs/QmeSrf6pzut73u6zLQkRFQ3ygt3k6XFT2kjdYP8Tnkwwyg/go-cid" cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
ipld "gx/ipfs/Qme5bWv7wtjUNGsK2BNGVUFPKiuxWrsqrtvYwCLRw8YFES/go-ipld-format"
) )
type PinAPI struct { type PinAPI struct {
@ -97,7 +100,9 @@ func (n *badNode) Err() error {
func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, error) { func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, error) {
visited := make(map[string]*pinStatus) visited := make(map[string]*pinStatus)
getLinks := api.node.DAG.GetOfflineLinkService().GetLinks bs := api.node.Blocks.Blockstore()
DAG := merkledag.NewDAGService(bserv.New(bs, offline.Exchange(bs)))
getLinks := merkledag.GetLinksWithDAG(DAG)
recPins := api.node.Pinning.RecursiveKeys() recPins := api.node.Pinning.RecursiveKeys()
var checkPin func(root *cid.Cid) *pinStatus var checkPin func(root *cid.Cid) *pinStatus
@ -152,7 +157,7 @@ func (p *pinInfo) Type() string {
return p.pinType return p.pinType
} }
func pinLsAll(typeStr string, ctx context.Context, pinning pin.Pinner, dag merkledag.DAGService) ([]coreiface.Pin, error) { func pinLsAll(typeStr string, ctx context.Context, pinning pin.Pinner, dag ipld.DAGService) ([]coreiface.Pin, error) {
keys := make(map[string]*pinInfo) keys := make(map[string]*pinInfo)
@ -171,7 +176,7 @@ func pinLsAll(typeStr string, ctx context.Context, pinning pin.Pinner, dag merkl
if typeStr == "indirect" || typeStr == "all" { if typeStr == "indirect" || typeStr == "all" {
set := cid.NewSet() set := cid.NewSet()
for _, k := range pinning.RecursiveKeys() { for _, k := range pinning.RecursiveKeys() {
err := merkledag.EnumerateChildren(ctx, dag.GetLinks, k, set.Visit) err := merkledag.EnumerateChildren(ctx, merkledag.GetLinksWithDAG(dag), k, set.Visit)
if err != nil { if err != nil {
return nil, err return nil, err
} }