From 14866308c7dbee722a38905acff7a65dbcc505fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Tue, 23 Apr 2019 14:41:00 +0200
Subject: [PATCH] move reprovider out of exchange directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
---
 core/core.go                                        | 8 ++++----
 core/node/core.go                                   | 1 -
 core/node/provider.go                               | 2 +-
 {exchange/reprovide => reprovide}/providers.go      | 8 ++++----
 {exchange/reprovide => reprovide}/reprovide.go      | 0
 {exchange/reprovide => reprovide}/reprovide_test.go | 9 ++++-----
 6 files changed, 13 insertions(+), 15 deletions(-)
 rename {exchange/reprovide => reprovide}/providers.go (91%)
 rename {exchange/reprovide => reprovide}/reprovide.go (100%)
 rename {exchange/reprovide => reprovide}/reprovide_test.go (86%)

diff --git a/core/core.go b/core/core.go
index c8ecbe19f..23656e722 100644
--- a/core/core.go
+++ b/core/core.go
@@ -19,7 +19,6 @@ import (
 	"github.com/ipfs/go-ipfs/core/bootstrap"
 	"github.com/ipfs/go-ipfs/core/node"
 	"github.com/ipfs/go-ipfs/core/node/libp2p"
-	rp "github.com/ipfs/go-ipfs/exchange/reprovide"
 	"github.com/ipfs/go-ipfs/filestore"
 	"github.com/ipfs/go-ipfs/fuse/mount"
 	"github.com/ipfs/go-ipfs/namesys"
@@ -28,6 +27,7 @@ import (
 	"github.com/ipfs/go-ipfs/pin"
 	"github.com/ipfs/go-ipfs/provider"
 	"github.com/ipfs/go-ipfs/repo"
+	rp "github.com/ipfs/go-ipfs/reprovide"
 
 	bserv "github.com/ipfs/go-blockservice"
 	bstore "github.com/ipfs/go-ipfs-blockstore"
@@ -69,9 +69,9 @@ type IpfsNode struct {
 	Repo repo.Repo
 
 	// Local node
-	Pinning         pin.Pinner                               // the pinning manager
-	Mounts          Mounts               `optional:"true"`   // current mount state, if any.
-	PrivateKey      ic.PrivKey                               // the local node's private Key
+	Pinning         pin.Pinner             // the pinning manager
+	Mounts          Mounts                 `optional:"true"` // current mount state, if any.
+	PrivateKey      ic.PrivKey             // the local node's private Key
 	PNetFingerprint libp2p.PNetFingerprint `optional:"true"` // fingerprint of private network
 
 	// Services
diff --git a/core/node/core.go b/core/node/core.go
index 5da6d2752..d7f3ba97e 100644
--- a/core/node/core.go
+++ b/core/node/core.go
@@ -119,4 +119,3 @@ func Files(mctx helpers.MetricsCtx, lc fx.Lifecycle, repo repo.Repo, dag format.
 
 	return root, err
 }
-
diff --git a/core/node/provider.go b/core/node/provider.go
index 336a9fd36..6736b9358 100644
--- a/core/node/provider.go
+++ b/core/node/provider.go
@@ -11,10 +11,10 @@ import (
 	"go.uber.org/fx"
 
 	"github.com/ipfs/go-ipfs/core/node/helpers"
-	"github.com/ipfs/go-ipfs/exchange/reprovide"
 	"github.com/ipfs/go-ipfs/pin"
 	"github.com/ipfs/go-ipfs/provider"
 	"github.com/ipfs/go-ipfs/repo"
+	"github.com/ipfs/go-ipfs/reprovide"
 )
 
 const kReprovideFrequency = time.Hour * 12
diff --git a/exchange/reprovide/providers.go b/reprovide/providers.go
similarity index 91%
rename from exchange/reprovide/providers.go
rename to reprovide/providers.go
index 77b19e2f8..7e7fbef19 100644
--- a/exchange/reprovide/providers.go
+++ b/reprovide/providers.go
@@ -3,13 +3,13 @@ package reprovide
 import (
 	"context"
 
-	pin "github.com/ipfs/go-ipfs/pin"
+	"github.com/ipfs/go-ipfs/pin"
 
-	cid "github.com/ipfs/go-cid"
-	cidutil "github.com/ipfs/go-cidutil"
+	"github.com/ipfs/go-cid"
+	"github.com/ipfs/go-cidutil"
 	blocks "github.com/ipfs/go-ipfs-blockstore"
 	ipld "github.com/ipfs/go-ipld-format"
-	merkledag "github.com/ipfs/go-merkledag"
+	"github.com/ipfs/go-merkledag"
 )
 
 // NewBlockstoreProvider returns key provider using bstore.AllKeysChan
diff --git a/exchange/reprovide/reprovide.go b/reprovide/reprovide.go
similarity index 100%
rename from exchange/reprovide/reprovide.go
rename to reprovide/reprovide.go
diff --git a/exchange/reprovide/reprovide_test.go b/reprovide/reprovide_test.go
similarity index 86%
rename from exchange/reprovide/reprovide_test.go
rename to reprovide/reprovide_test.go
index ce1d123c1..2f81066a1 100644
--- a/exchange/reprovide/reprovide_test.go
+++ b/reprovide/reprovide_test.go
@@ -2,6 +2,7 @@ package reprovide_test
 
 import (
 	"context"
+	"github.com/ipfs/go-ipfs"
 	"testing"
 
 	blocks "github.com/ipfs/go-block-format"
@@ -10,9 +11,7 @@ import (
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	mock "github.com/ipfs/go-ipfs-routing/mock"
 	pstore "github.com/libp2p/go-libp2p-peerstore"
-	testutil "github.com/libp2p/go-testutil"
-
-	. "github.com/ipfs/go-ipfs/exchange/reprovide"
+	"github.com/libp2p/go-testutil"
 )
 
 func TestReprovide(t *testing.T) {
@@ -35,8 +34,8 @@ func TestReprovide(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	keyProvider := NewBlockstoreProvider(bstore)
-	reprov := NewReprovider(ctx, clA, keyProvider)
+	keyProvider := ipfs.NewBlockstoreProvider(bstore)
+	reprov := ipfs.NewReprovider(ctx, clA, keyProvider)
 	err = reprov.Reprovide()
 	if err != nil {
 		t.Fatal(err)