move reprovider out of exchange directory
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Apr 23, 2019 at 14:41 UTC
14866308c7dbee722a38905acff7a65dbcc505fd
6 files changed
+13
-15
core/core.go
+4
-4
@@ -19,7 +19,6 @@ import (
19
"github.com/ipfs/go-ipfs/core/bootstrap"
20
"github.com/ipfs/go-ipfs/core/node"
21
"github.com/ipfs/go-ipfs/core/node/libp2p"
22
- rp "github.com/ipfs/go-ipfs/exchange/reprovide"
22
"github.com/ipfs/go-ipfs/filestore"
23
"github.com/ipfs/go-ipfs/fuse/mount"
24
"github.com/ipfs/go-ipfs/namesys"
@@ -28,6 +27,7 @@ import (
27
"github.com/ipfs/go-ipfs/pin"
28
"github.com/ipfs/go-ipfs/provider"
29
"github.com/ipfs/go-ipfs/repo"
30
+ rp "github.com/ipfs/go-ipfs/reprovide"
31
32
bserv "github.com/ipfs/go-blockservice"
33
bstore "github.com/ipfs/go-ipfs-blockstore"
@@ -69,9 +69,9 @@ type IpfsNode struct {
69
Repo repo.Repo
70
71
// Local node
72
- Pinning pin.Pinner // the pinning manager
73
- Mounts Mounts `optional:"true"` // current mount state, if any.
74
- PrivateKey ic.PrivKey // the local node's private Key
72
+ Pinning pin.Pinner // the pinning manager
73
+ Mounts Mounts `optional:"true"` // current mount state, if any.
74
+ PrivateKey ic.PrivKey // the local node's private Key
75
PNetFingerprint libp2p.PNetFingerprint `optional:"true"` // fingerprint of private network
76
77
// Services
core/node/core.go
-1
@@ -119,4 +119,3 @@ func Files(mctx helpers.MetricsCtx, lc fx.Lifecycle, repo repo.Repo, dag format.
119
120
return root, err
121
}
122
-
core/node/provider.go
+1
-1
@@ -11,10 +11,10 @@ import (
11
"go.uber.org/fx"
12
13
"github.com/ipfs/go-ipfs/core/node/helpers"
14
- "github.com/ipfs/go-ipfs/exchange/reprovide"
14
"github.com/ipfs/go-ipfs/pin"
15
"github.com/ipfs/go-ipfs/provider"
16
"github.com/ipfs/go-ipfs/repo"
17
+ "github.com/ipfs/go-ipfs/reprovide"
18
)
19
20
const kReprovideFrequency = time.Hour * 12
reprovide/providers.go
renamed
+4
-4
@@ -3,13 +3,13 @@ package reprovide
3
import (
4
"context"
5
6
- pin "github.com/ipfs/go-ipfs/pin"
6
+ "github.com/ipfs/go-ipfs/pin"
7
8
- cid "github.com/ipfs/go-cid"
9
- cidutil "github.com/ipfs/go-cidutil"
8
+ "github.com/ipfs/go-cid"
9
+ "github.com/ipfs/go-cidutil"
10
blocks "github.com/ipfs/go-ipfs-blockstore"
11
ipld "github.com/ipfs/go-ipld-format"
12
- merkledag "github.com/ipfs/go-merkledag"
12
+ "github.com/ipfs/go-merkledag"
13
)
14
15
// NewBlockstoreProvider returns key provider using bstore.AllKeysChan
reprovide/reprovide.go
renamed
reprovide/reprovide_test.go
renamed
+4
-5
@@ -2,6 +2,7 @@ package reprovide_test
2
3
import (
4
"context"
5
+ "github.com/ipfs/go-ipfs"
6
"testing"
7
8
blocks "github.com/ipfs/go-block-format"
@@ -10,9 +11,7 @@ import (
11
blockstore "github.com/ipfs/go-ipfs-blockstore"
12
mock "github.com/ipfs/go-ipfs-routing/mock"
13
pstore "github.com/libp2p/go-libp2p-peerstore"
13
- testutil "github.com/libp2p/go-testutil"
14
-
15
- . "github.com/ipfs/go-ipfs/exchange/reprovide"
14
+ "github.com/libp2p/go-testutil"
15
)
16
17
func TestReprovide(t *testing.T) {
@@ -35,8 +34,8 @@ func TestReprovide(t *testing.T) {
34
t.Fatal(err)
35
}
36
38
- keyProvider := NewBlockstoreProvider(bstore)
39
- reprov := NewReprovider(ctx, clA, keyProvider)
37
+ keyProvider := ipfs.NewBlockstoreProvider(bstore)
38
+ reprov := ipfs.NewReprovider(ctx, clA, keyProvider)
39
err = reprov.Reprovide()
40
if err != nil {
41
t.Fatal(err)