Skip to content

Commit

Permalink
WIP REBASE
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelavila
michaelavila committed Mar 5, 2019
1 parent 72de32d commit 94a5d26
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 22 deletions.
6 changes: 3 additions & 3 deletions core/commands/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package commands
import (
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"

cmds "gx/ipfs/QmQtQrtNioesAWtrx8csBvfY37gTe94d6wQ3VikZUjxD39/go-ipfs-cmds"
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
cmds "github.com/ipfs/go-ipfs-cmds"
cmdkit "github.com/ipfs/go-ipfs-cmdkit"
)

var ProviderCmd = &cmds.Command{
Expand All @@ -31,7 +31,7 @@ Trigger reprovider to announce our data to network.
return err
}

if !nd.OnlineMode() {
if !nd.IsOnline {
return ErrNotOnline
}

Expand Down
2 changes: 1 addition & 1 deletion core/coreapi/provider.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package coreapi

import (
cid "gx/ipfs/QmTbxNB1NwDesLmKTscr4udL2tVP7MaxvXnD1D9yX7g3PN/go-cid"
cid "github.com/ipfs/go-cid"
)

type ProviderAPI CoreAPI
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,5 @@ require (
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
gotest.tools/gotestsum v0.3.3
)

replace github.com/ipfs/interface-go-ipfs-core v0.0.1 => ../interface-go-ipfs-core
8 changes: 4 additions & 4 deletions provider/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ package provider
import (
"context"
"fmt"
cid "gx/ipfs/QmTbxNB1NwDesLmKTscr4udL2tVP7MaxvXnD1D9yX7g3PN/go-cid"
bstore "gx/ipfs/QmXjKkjMDTtXAiLBwstVexofB8LeruZmE2eBd85GwGFFLA/go-ipfs-blockstore"
logging "gx/ipfs/QmbkT7eMTyXfpeyB3ZMxxcxg7XH8t6uXp49jqzz4HB7BGF/go-log"
"gx/ipfs/QmcxZXMqFu4vjLQRfG2tAcg6DPQNurgZ2SQ5iQVk6dXQjn/go-libp2p-routing"
cid "github.com/ipfs/go-cid"
bstore "github.com/ipfs/go-ipfs-blockstore"
logging "github.com/ipfs/go-log"
"github.com/libp2p/go-libp2p-routing"
"time"
)

Expand Down
10 changes: 5 additions & 5 deletions provider/queue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ package provider

import (
"context"
cid "gx/ipfs/QmTbxNB1NwDesLmKTscr4udL2tVP7MaxvXnD1D9yX7g3PN/go-cid"
ds "gx/ipfs/QmUadX5EcvrBmxAV9sE7wUWtWSqxns5K84qKJBixmcT1w9/go-datastore"
namespace "gx/ipfs/QmUadX5EcvrBmxAV9sE7wUWtWSqxns5K84qKJBixmcT1w9/go-datastore/namespace"
query "gx/ipfs/QmUadX5EcvrBmxAV9sE7wUWtWSqxns5K84qKJBixmcT1w9/go-datastore/query"
errors "gx/ipfs/QmVmDhyTTUcQXFD1rRQ64fGLMSAoaQvNH3hwuaCFAPq2hy/errors"
"errors"
"math"
"strconv"
"strings"
"sync"
cid "github.com/ipfs/go-cid"
ds "github.com/ipfs/go-datastore"
namespace "github.com/ipfs/go-datastore/namespace"
query "github.com/ipfs/go-datastore/query"
)

// Entry allows for the durability in the queue. When a cid is dequeued it is
Expand Down
4 changes: 2 additions & 2 deletions provider/reprovider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package provider

import (
"context"
"gx/ipfs/QmXjKkjMDTtXAiLBwstVexofB8LeruZmE2eBd85GwGFFLA/go-ipfs-blockstore"
"gx/ipfs/QmcxZXMqFu4vjLQRfG2tAcg6DPQNurgZ2SQ5iQVk6dXQjn/go-libp2p-routing"
"github.com/ipfs/go-ipfs-blockstore"
"github.com/libp2p/go-libp2p-routing"
"time"
)

Expand Down
6 changes: 3 additions & 3 deletions provider/strategy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ package provider

import (
"context"
"gx/ipfs/QmScf5hnTEK8fDpRJAbcdMnKXpKUp1ytdymzXUbXDCFssp/go-merkledag"
"gx/ipfs/QmTbxNB1NwDesLmKTscr4udL2tVP7MaxvXnD1D9yX7g3PN/go-cid"
ipld "gx/ipfs/QmZ6nzCLwGLVfRzYLpD7pW6UNuBDKEcA2imJtVpbEx2rxy/go-ipld-format"
"github.com/ipfs/go-merkledag"
"github.com/ipfs/go-cid"
ipld "github.com/ipfs/go-ipld-format"
)

func NewProvideAllStrategy(dag ipld.DAGService) Strategy {
Expand Down
8 changes: 4 additions & 4 deletions provider/tracker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package provider

import (
"context"
"gx/ipfs/QmTbxNB1NwDesLmKTscr4udL2tVP7MaxvXnD1D9yX7g3PN/go-cid"
ds "gx/ipfs/QmUadX5EcvrBmxAV9sE7wUWtWSqxns5K84qKJBixmcT1w9/go-datastore"
"gx/ipfs/QmUadX5EcvrBmxAV9sE7wUWtWSqxns5K84qKJBixmcT1w9/go-datastore/namespace"
"gx/ipfs/QmUadX5EcvrBmxAV9sE7wUWtWSqxns5K84qKJBixmcT1w9/go-datastore/query"
"github.com/ipfs/go-cid"
ds "github.com/ipfs/go-datastore"
"github.com/ipfs/go-datastore/namespace"
"github.com/ipfs/go-datastore/query"
)

const providerTrackingPrefix = "/provider/tracking/"
Expand Down

1 comment on commit 94a5d26

@GitCop
Copy link

@GitCop GitCop commented on 94a5d26 Mar 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were the following issues with your Pull Request

We ask for a few features in the commit message for Open Source licensing hygiene and commit message clarity.
git commit --amend can often help you quickly improve the commit message.
Guidelines and a script are available to help in the long run.
Your feedback on GitCop is welcome on this issue.

This message was auto-generated by https://gitcop.com

Please sign in to comment.