Merge pull request #6511 from ipfs/extract/filestore

Extract Filestore
ipfs · Jul 15, 2019 · 333c9d1 · 333c9d1
2 parents 5537308 + 02f7bc8
commit 333c9d1
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 1,473 deletions.
diff --git a/Rules.mk b/Rules.mk
@@ -51,10 +51,6 @@ endif
 dir := pin/internal/pb
 include $(dir)/Rules.mk
 
-dir := filestore/pb
-include $(dir)/Rules.mk
-
-
 # -------------------- #
 #   universal rules    #
 # -------------------- #

diff --git a/core/commands/filestore.go b/core/commands/filestore.go
@@ -5,10 +5,10 @@ import (
 	"io"
 	"os"
 
+	filestore "github.com/ipfs/go-filestore"
 	core "github.com/ipfs/go-ipfs/core"
 	cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
 	e "github.com/ipfs/go-ipfs/core/commands/e"
-	filestore "github.com/ipfs/go-ipfs/filestore"
 
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-ipfs-cmds"

diff --git a/core/commands/urlstore.go b/core/commands/urlstore.go
@@ -5,8 +5,8 @@ import (
 	"io"
 	"net/url"
 
+	filestore "github.com/ipfs/go-filestore"
 	cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
-	filestore "github.com/ipfs/go-ipfs/filestore"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
 	files "github.com/ipfs/go-ipfs-files"

diff --git a/core/core.go b/core/core.go
@@ -13,11 +13,11 @@ import (
 	"context"
 	"io"
 
+	"github.com/ipfs/go-filestore"
 	version "github.com/ipfs/go-ipfs"
 	"github.com/ipfs/go-ipfs/core/bootstrap"
 	"github.com/ipfs/go-ipfs/core/node"
 	"github.com/ipfs/go-ipfs/core/node/libp2p"
-	"github.com/ipfs/go-ipfs/filestore"
 	"github.com/ipfs/go-ipfs/fuse/mount"
 	"github.com/ipfs/go-ipfs/namesys"
 	ipnsrp "github.com/ipfs/go-ipfs/namesys/republisher"

diff --git a/core/coreapi/test/api_test.go b/core/coreapi/test/api_test.go
@@ -8,11 +8,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/ipfs/go-filestore"
 	"github.com/ipfs/go-ipfs/core"
 	"github.com/ipfs/go-ipfs/core/bootstrap"
 	"github.com/ipfs/go-ipfs/core/coreapi"
 	mock "github.com/ipfs/go-ipfs/core/mock"
-	"github.com/ipfs/go-ipfs/filestore"
 	"github.com/ipfs/go-ipfs/keystore"
 	"github.com/ipfs/go-ipfs/repo"
 

diff --git a/core/node/storage.go b/core/node/storage.go
@@ -11,8 +11,8 @@ import (
 	config "github.com/ipfs/go-ipfs-config"
 	"go.uber.org/fx"
 
+	"github.com/ipfs/go-filestore"
 	"github.com/ipfs/go-ipfs/core/node/helpers"
-	"github.com/ipfs/go-ipfs/filestore"
 	"github.com/ipfs/go-ipfs/repo"
 	"github.com/ipfs/go-ipfs/thirdparty/cidv0v1"
 	"github.com/ipfs/go-ipfs/thirdparty/verifbs"

diff --git a/filestore/filestore.go b/filestore/filestore.go