From 3f7927f1d8e63a2de6668b8a5a785082b394bc78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Mon, 15 Jul 2019 15:50:26 +0200 Subject: [PATCH] Update imports to go-filestore --- core/commands/filestore.go | 2 +- core/commands/urlstore.go | 2 +- core/core.go | 2 +- core/coreapi/test/api_test.go | 2 +- core/node/storage.go | 2 +- go.mod | 2 +- go.sum | 1 + repo/fsrepo/fsrepo.go | 2 +- repo/mock.go | 2 +- repo/repo.go | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/core/commands/filestore.go b/core/commands/filestore.go index bf0f6981f..c36308bc1 100644 --- 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 index abebf76db..c71229b5a 100644 --- 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 index f87fd1da7..0f3b7083b 100644 --- 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 index f6700e1af..86c3dd504 100644 --- 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 index 008b1970a..f1d9495fe 100644 --- 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/go.mod b/go.mod index cfa796d58..102dbfd94 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/ipfs/go-ds-flatfs v0.0.2 github.com/ipfs/go-ds-leveldb v0.0.2 github.com/ipfs/go-ds-measure v0.0.1 - github.com/ipfs/go-filestore v0.0.1 // indirect + github.com/ipfs/go-filestore v0.0.1 github.com/ipfs/go-fs-lock v0.0.1 github.com/ipfs/go-ipfs-blockstore v0.0.1 github.com/ipfs/go-ipfs-chunker v0.0.1 diff --git a/go.sum b/go.sum index e1c81c986..30537484f 100644 --- a/go.sum +++ b/go.sum @@ -296,6 +296,7 @@ github.com/ipfs/go-merkledag v0.0.6 h1:rYZc0yzhO7y1cKi3Rw425a2HhEJDdLvNOWsqtmO3P github.com/ipfs/go-merkledag v0.0.6/go.mod h1:QYPdnlvkOg7GnQRofu9XZimC5ZW5Wi3bKys/4GQQfto= github.com/ipfs/go-merkledag v0.1.0 h1:CAEXjRFEDPvealQj3TgEjV1IJckwjvmxAqtq5QSXJrg= github.com/ipfs/go-merkledag v0.1.0/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk= +github.com/ipfs/go-merkledag v0.2.0 h1:EAjIQCgZ6/DnOAlKY3+59j72FD9BsYtNaCRSmN0xIbU= github.com/ipfs/go-merkledag v0.2.0/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk= github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fGD6n0jO4kdg= github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY= diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go index d35c97140..b28aed8ad 100644 --- a/repo/fsrepo/fsrepo.go +++ b/repo/fsrepo/fsrepo.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - filestore "github.com/ipfs/go-ipfs/filestore" + filestore "github.com/ipfs/go-filestore" keystore "github.com/ipfs/go-ipfs/keystore" repo "github.com/ipfs/go-ipfs/repo" "github.com/ipfs/go-ipfs/repo/common" diff --git a/repo/mock.go b/repo/mock.go index 78ec9073b..c3e41dc14 100644 --- a/repo/mock.go +++ b/repo/mock.go @@ -3,7 +3,7 @@ package repo import ( "errors" - filestore "github.com/ipfs/go-ipfs/filestore" + filestore "github.com/ipfs/go-filestore" keystore "github.com/ipfs/go-ipfs/keystore" config "github.com/ipfs/go-ipfs-config" diff --git a/repo/repo.go b/repo/repo.go index ffb024afa..5c2557c6a 100644 --- a/repo/repo.go +++ b/repo/repo.go @@ -4,7 +4,7 @@ import ( "errors" "io" - filestore "github.com/ipfs/go-ipfs/filestore" + filestore "github.com/ipfs/go-filestore" keystore "github.com/ipfs/go-ipfs/keystore" ds "github.com/ipfs/go-datastore"