fix: rewrite dependencies over the go-ipfs-config package

laurentsenta · laurentsenta · commit e1d933313fac · 2022-03-04T09:32:31.000+01:00
diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
@@ -17,10 +17,10 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 
 	version "github.com/ipfs/go-ipfs"
-	config "github.com/ipfs/go-ipfs-config"
-	cserial "github.com/ipfs/go-ipfs-config/serialize"
 	utilmain "github.com/ipfs/go-ipfs/cmd/ipfs/util"
 	oldcmds "github.com/ipfs/go-ipfs/commands"
+	config "github.com/ipfs/go-ipfs/config"
+	cserial "github.com/ipfs/go-ipfs/config/serialize"
 	"github.com/ipfs/go-ipfs/core"
 	commands "github.com/ipfs/go-ipfs/core/commands"
 	"github.com/ipfs/go-ipfs/core/coreapi"
diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go
@@ -19,8 +19,8 @@ import (
 	unixfs "github.com/ipfs/go-unixfs"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	config "github.com/ipfs/go-ipfs-config"
 	files "github.com/ipfs/go-ipfs-files"
+	config "github.com/ipfs/go-ipfs/config"
 	options "github.com/ipfs/interface-go-ipfs-core/options"
 )
 
diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go
@@ -24,8 +24,8 @@ import (
 	cmds "github.com/ipfs/go-ipfs-cmds"
 	"github.com/ipfs/go-ipfs-cmds/cli"
 	cmdhttp "github.com/ipfs/go-ipfs-cmds/http"
-	config "github.com/ipfs/go-ipfs-config"
 	u "github.com/ipfs/go-ipfs-util"
+	config "github.com/ipfs/go-ipfs/config"
 	logging "github.com/ipfs/go-log"
 	loggables "github.com/libp2p/go-libp2p-loggables"
 	ma "github.com/multiformats/go-multiaddr"
diff --git a/cmd/ipfs/pinmfs.go b/cmd/ipfs/pinmfs.go
@@ -13,7 +13,7 @@ import (
 	logging "github.com/ipfs/go-log"
 	pinclient "github.com/ipfs/go-pinning-service-http-client"
 
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	"github.com/ipfs/go-ipfs/core"
 )
 
diff --git a/cmd/ipfs/pinmfs_test.go b/cmd/ipfs/pinmfs_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	ipld "github.com/ipfs/go-ipld-format"
 	merkledag "github.com/ipfs/go-merkledag"
 	"github.com/libp2p/go-libp2p-core/host"
diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go
@@ -1,3 +1,4 @@
+//go:build !plan9
 // +build !plan9
 
 package main
@@ -18,8 +19,8 @@ import (
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 
 	fsnotify "github.com/fsnotify/fsnotify"
-	config "github.com/ipfs/go-ipfs-config"
 	files "github.com/ipfs/go-ipfs-files"
+	config "github.com/ipfs/go-ipfs/config"
 	process "github.com/jbenet/goprocess"
 	homedir "github.com/mitchellh/go-homedir"
 )
diff --git a/commands/context.go b/commands/context.go
@@ -11,7 +11,7 @@ import (
 	loader "github.com/ipfs/go-ipfs/plugin/loader"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	logging "github.com/ipfs/go-log"
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	options "github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/config/serialize/serialize.go b/config/serialize/serialize.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/ipfs/go-ipfs-config"
+	"github.com/ipfs/go-ipfs/config"
 
 	"github.com/facebookgo/atomicfile"
 )
diff --git a/config/serialize/serialize_test.go b/config/serialize/serialize_test.go
@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"testing"
 
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 )
 
 func TestConfig(t *testing.T) {
diff --git a/core/commands/bootstrap.go b/core/commands/bootstrap.go
@@ -11,7 +11,7 @@ import (
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	peer "github.com/libp2p/go-libp2p-core/peer"
 	ma "github.com/multiformats/go-multiaddr"
 )
diff --git a/core/commands/cmdenv/env.go b/core/commands/cmdenv/env.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ipfs/go-ipfs/core"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	logging "github.com/ipfs/go-log"
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	options "github.com/ipfs/interface-go-ipfs-core/options"
diff --git a/core/commands/config.go b/core/commands/config.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/elgris/jsondiff"
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 )
 
 // ConfigUpdateOutput is config profile apply command's output
diff --git a/core/commands/keystore.go b/core/commands/keystore.go
@@ -14,9 +14,9 @@ import (
 	"text/tabwriter"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	config "github.com/ipfs/go-ipfs-config"
 	keystore "github.com/ipfs/go-ipfs-keystore"
 	oldcmds "github.com/ipfs/go-ipfs/commands"
+	config "github.com/ipfs/go-ipfs/config"
 	cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
 	"github.com/ipfs/go-ipfs/core/commands/e"
 	ke "github.com/ipfs/go-ipfs/core/commands/keyencode"
diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows && !nofuse
 // +build !windows,!nofuse
 
 package commands
@@ -10,7 +11,7 @@ import (
 	nodeMount "github.com/ipfs/go-ipfs/fuse/node"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 )
 
 const (
diff --git a/core/commands/pin/remotepin.go b/core/commands/pin/remotepin.go
@@ -17,7 +17,7 @@ import (
 
 	cid "github.com/ipfs/go-cid"
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	"github.com/ipfs/go-ipfs/core/commands/cmdenv"
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 	logging "github.com/ipfs/go-log"
diff --git a/core/commands/swarm.go b/core/commands/swarm.go
@@ -16,7 +16,7 @@ import (
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	inet "github.com/libp2p/go-libp2p-core/network"
 	peer "github.com/libp2p/go-libp2p-core/peer"
 	ma "github.com/multiformats/go-multiaddr"
diff --git a/core/core_test.go b/core/core_test.go
@@ -9,7 +9,7 @@ import (
 
 	datastore "github.com/ipfs/go-datastore"
 	syncds "github.com/ipfs/go-datastore/sync"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 )
 
 func TestInitialization(t *testing.T) {
diff --git a/core/coreapi/test/api_test.go b/core/coreapi/test/api_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-filestore"
-	"github.com/ipfs/go-ipfs-keystore"
+	keystore "github.com/ipfs/go-ipfs-keystore"
 	"github.com/ipfs/go-ipfs/core"
 	"github.com/ipfs/go-ipfs/core/bootstrap"
 	"github.com/ipfs/go-ipfs/core/coreapi"
@@ -19,12 +19,12 @@ import (
 
 	"github.com/ipfs/go-datastore"
 	syncds "github.com/ipfs/go-datastore/sync"
-	"github.com/ipfs/go-ipfs-config"
+	"github.com/ipfs/go-ipfs/config"
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 	"github.com/ipfs/interface-go-ipfs-core/tests"
 	"github.com/libp2p/go-libp2p-core/crypto"
 	peer "github.com/libp2p/go-libp2p-core/peer"
-	"github.com/libp2p/go-libp2p/p2p/net/mock"
+	mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
 )
 
 const testPeerID = "QmTFauExutTsy4XP6JbMFcw2Wa9645HJt2bTqL6qYDCKfe"
diff --git a/core/corehttp/commands.go b/core/corehttp/commands.go
@@ -16,7 +16,7 @@ import (
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
 	cmdsHttp "github.com/ipfs/go-ipfs-cmds/http"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	path "github.com/ipfs/go-path"
 )
 
diff --git a/core/corehttp/gateway_test.go b/core/corehttp/gateway_test.go
@@ -19,8 +19,8 @@ import (
 
 	datastore "github.com/ipfs/go-datastore"
 	syncds "github.com/ipfs/go-datastore/sync"
-	config "github.com/ipfs/go-ipfs-config"
 	files "github.com/ipfs/go-ipfs-files"
+	config "github.com/ipfs/go-ipfs/config"
 	path "github.com/ipfs/go-path"
 	iface "github.com/ipfs/interface-go-ipfs-core"
 	nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
diff --git a/core/corehttp/hostname.go b/core/corehttp/hostname.go
@@ -18,7 +18,7 @@ import (
 
 	mbase "github.com/multiformats/go-multibase"
 
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	iface "github.com/ipfs/interface-go-ipfs-core"
 	options "github.com/ipfs/interface-go-ipfs-core/options"
 	nsopts "github.com/ipfs/interface-go-ipfs-core/options/namesys"
diff --git a/core/corehttp/hostname_test.go b/core/corehttp/hostname_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	cid "github.com/ipfs/go-cid"
-	config "github.com/ipfs/go-ipfs-config"
 	files "github.com/ipfs/go-ipfs-files"
+	config "github.com/ipfs/go-ipfs/config"
 	coreapi "github.com/ipfs/go-ipfs/core/coreapi"
 	path "github.com/ipfs/go-path"
 )
diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go
@@ -21,9 +21,9 @@ import (
 	"github.com/ipfs/go-datastore"
 	syncds "github.com/ipfs/go-datastore/sync"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	config "github.com/ipfs/go-ipfs-config"
 	files "github.com/ipfs/go-ipfs-files"
 	pi "github.com/ipfs/go-ipfs-posinfo"
+	config "github.com/ipfs/go-ipfs/config"
 	dag "github.com/ipfs/go-merkledag"
 	coreiface "github.com/ipfs/interface-go-ipfs-core"
 )
diff --git a/core/mock/mock.go b/core/mock/mock.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/ipfs/go-datastore"
 	syncds "github.com/ipfs/go-datastore/sync"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 
 	"github.com/libp2p/go-libp2p"
 	"github.com/libp2p/go-libp2p-core/host"
diff --git a/core/node/bitswap.go b/core/node/bitswap.go
@@ -6,8 +6,8 @@ import (
 	"github.com/ipfs/go-bitswap"
 	"github.com/ipfs/go-bitswap/network"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	config "github.com/ipfs/go-ipfs-config"
 	exchange "github.com/ipfs/go-ipfs-exchange-interface"
+	config "github.com/ipfs/go-ipfs/config"
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/libp2p/go-libp2p-core/routing"
 	"go.uber.org/fx"
diff --git a/core/node/builder.go b/core/node/builder.go
@@ -14,7 +14,7 @@ import (
 
 	ds "github.com/ipfs/go-datastore"
 	dsync "github.com/ipfs/go-datastore/sync"
-	cfg "github.com/ipfs/go-ipfs-config"
+	cfg "github.com/ipfs/go-ipfs/config"
 	"github.com/libp2p/go-libp2p-core/crypto"
 	peer "github.com/libp2p/go-libp2p-core/peer"
 )
diff --git a/core/node/dns.go b/core/node/dns.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	doh "github.com/libp2p/go-doh-resolver"
 	madns "github.com/multiformats/go-multiaddr-dns"
 
diff --git a/core/node/groups.go b/core/node/groups.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	config "github.com/ipfs/go-ipfs-config"
 	util "github.com/ipfs/go-ipfs-util"
+	config "github.com/ipfs/go-ipfs/config"
 	"github.com/ipfs/go-log"
 	"github.com/libp2p/go-libp2p-core/peer"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
diff --git a/core/node/libp2p/libp2p.go b/core/node/libp2p/libp2p.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	version "github.com/ipfs/go-ipfs"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 
 	logging "github.com/ipfs/go-log"
 	"github.com/libp2p/go-libp2p"
diff --git a/core/node/libp2p/nat.go b/core/node/libp2p/nat.go
@@ -3,7 +3,7 @@ package libp2p
 import (
 	"time"
 
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	"github.com/libp2p/go-libp2p"
 )
 
diff --git a/core/node/libp2p/relay.go b/core/node/libp2p/relay.go
@@ -1,7 +1,7 @@
 package libp2p
 
 import (
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	"github.com/libp2p/go-libp2p-core/peer"
 
 	"github.com/libp2p/go-libp2p"
diff --git a/core/node/libp2p/sec.go b/core/node/libp2p/sec.go
@@ -1,7 +1,7 @@
 package libp2p
 
 import (
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	"github.com/libp2p/go-libp2p"
 	noise "github.com/libp2p/go-libp2p-noise"
 	tls "github.com/libp2p/go-libp2p-tls"
diff --git a/core/node/libp2p/smux.go b/core/node/libp2p/smux.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	"github.com/libp2p/go-libp2p"
 	smux "github.com/libp2p/go-libp2p-core/mux"
 	mplex "github.com/libp2p/go-libp2p-mplex"
diff --git a/core/node/libp2p/transport.go b/core/node/libp2p/transport.go
@@ -3,7 +3,7 @@ package libp2p
 import (
 	"fmt"
 
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	libp2p "github.com/libp2p/go-libp2p"
 	metrics "github.com/libp2p/go-libp2p-core/metrics"
 	libp2pquic "github.com/libp2p/go-libp2p-quic-transport"
diff --git a/core/node/storage.go b/core/node/storage.go
@@ -3,7 +3,7 @@ package node
 import (
 	"github.com/ipfs/go-datastore"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	config "github.com/ipfs/go-ipfs-config"
+	config "github.com/ipfs/go-ipfs/config"
 	"go.uber.org/fx"
 
 	"github.com/ipfs/go-filestore"
diff --git a/go.mod b/go.mod
@@ -32,7 +32,6 @@ require (
 	github.com/ipfs/go-ipfs-blockstore v1.1.2
 	github.com/ipfs/go-ipfs-chunker v0.0.5
 	github.com/ipfs/go-ipfs-cmds v0.6.0
-	github.com/ipfs/go-ipfs-config v0.19.0
 	github.com/ipfs/go-ipfs-exchange-interface v0.1.0
 	github.com/ipfs/go-ipfs-exchange-offline v0.1.1
 	github.com/ipfs/go-ipfs-files v0.0.9
diff --git a/go.sum b/go.sum
@@ -476,8 +476,6 @@ github.com/ipfs/go-ipfs-chunker v0.0.5 h1:ojCf7HV/m+uS2vhUGWcogIIxiO5ubl5O57Q7Na
 github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod h1:jhgdF8vxRHycr00k13FM8Y0E+6BoalYeobXmUyTreP8=
 github.com/ipfs/go-ipfs-cmds v0.6.0 h1:yAxdowQZzoFKjcLI08sXVNnqVj3jnABbf9smrPQmBsw=
 github.com/ipfs/go-ipfs-cmds v0.6.0/go.mod h1:ZgYiWVnCk43ChwoH8hAmI1IRbuVtq3GSTHwtRB/Kqhk=
-github.com/ipfs/go-ipfs-config v0.19.0 h1:OuKIL+BkOZgJ+hb4Wg/9ynCtE/BaZBWcGy8hgdMepAo=
-github.com/ipfs/go-ipfs-config v0.19.0/go.mod h1:wz2lKzOjgJeYJa6zx8W9VT7mz+iSd0laBMqS/9wmX6A=
 github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
 github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
 github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
diff --git a/package-list.json b/package-list.json
@@ -42,7 +42,6 @@
     ["ipfs/go-ipns", "go-ipns", "IPNS datastructures and validation logic"],
 
     "Repo",
-    ["ipfs/go-ipfs-config", "go-ipfs-config", "go-ipfs config file definitions"],
     ["ipfs/go-fs-lock", "go-fs-lock", "lockfile management functions"],
     ["ipfs/fs-repo-migrations", "fs-repo-migrations", "repo migrations"],
 
diff --git a/plugin/loader/loader.go b/plugin/loader/loader.go
@@ -8,8 +8,8 @@ import (
 	"runtime"
 	"strings"
 
-	config "github.com/ipfs/go-ipfs-config"
-	cserialize "github.com/ipfs/go-ipfs-config/serialize"
+	config "github.com/ipfs/go-ipfs/config"
+	cserialize "github.com/ipfs/go-ipfs/config/serialize"
 	"github.com/ipld/go-ipld-prime/multicodec"
 
 	"github.com/ipfs/go-ipfs/core"
diff --git a/repo/fsrepo/config_test.go b/repo/fsrepo/config_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/ipfs/go-ipfs/plugin/loader"
 	"github.com/ipfs/go-ipfs/repo/fsrepo"
 
-	"github.com/ipfs/go-ipfs-config"
+	"github.com/ipfs/go-ipfs/config"
 )
 
 // note: to test sorting of the mountpoints in the disk spec they are
diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go
diff --git a/repo/fsrepo/fsrepo_test.go b/repo/fsrepo/fsrepo_test.go
diff --git a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go
diff --git a/repo/fsrepo/migrations/migrations.go b/repo/fsrepo/migrations/migrations.go
diff --git a/repo/fsrepo/migrations/migrations_test.go b/repo/fsrepo/migrations/migrations_test.go
diff --git a/repo/fsrepo/misc.go b/repo/fsrepo/misc.go
diff --git a/repo/mock.go b/repo/mock.go
diff --git a/repo/repo.go b/repo/repo.go
diff --git a/test/bench/bench_cli_ipfs_add/main.go b/test/bench/bench_cli_ipfs_add/main.go
diff --git a/test/bench/offline_add/main.go b/test/bench/offline_add/main.go

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ import (`
`19`	`19`	`unixfs "github.com/ipfs/go-unixfs"`
`20`	`20`
`21`	`21`	`cmds "github.com/ipfs/go-ipfs-cmds"`
`22`		`- config "github.com/ipfs/go-ipfs-config"`
`23`	`22`	`files "github.com/ipfs/go-ipfs-files"`
	`23`	`+ config "github.com/ipfs/go-ipfs/config"`
`24`	`24`	`options "github.com/ipfs/interface-go-ipfs-core/options"`
`25`	`25`	`)`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`logging "github.com/ipfs/go-log"`
`14`	`14`	`pinclient "github.com/ipfs/go-pinning-service-http-client"`
`15`	`15`
`16`		`- config "github.com/ipfs/go-ipfs-config"`
	`16`	`+ config "github.com/ipfs/go-ipfs/config"`
`17`	`17`	`"github.com/ipfs/go-ipfs/core"`
`18`	`18`	`)`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"os"`
`9`	`9`	`"path/filepath"`
`10`	`10`
`11`		`- "github.com/ipfs/go-ipfs-config"`
	`11`	`+ "github.com/ipfs/go-ipfs/config"`
`12`	`12`
`13`	`13`	`"github.com/facebookgo/atomicfile"`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"runtime"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- config "github.com/ipfs/go-ipfs-config"`
	`8`	`+ config "github.com/ipfs/go-ipfs/config"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func TestConfig(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"`
`12`	`12`
`13`	`13`	`cmds "github.com/ipfs/go-ipfs-cmds"`
`14`		`- config "github.com/ipfs/go-ipfs-config"`
	`14`	`+ config "github.com/ipfs/go-ipfs/config"`
`15`	`15`	`peer "github.com/libp2p/go-libp2p-core/peer"`
`16`	`16`	`ma "github.com/multiformats/go-multiaddr"`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`
`17`	`17`	`"github.com/elgris/jsondiff"`
`18`	`18`	`cmds "github.com/ipfs/go-ipfs-cmds"`
`19`		`- config "github.com/ipfs/go-ipfs-config"`
	`19`	`+ config "github.com/ipfs/go-ipfs/config"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`// ConfigUpdateOutput is config profile apply command's output`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`datastore "github.com/ipfs/go-datastore"`
`11`	`11`	`syncds "github.com/ipfs/go-datastore/sync"`
`12`		`- config "github.com/ipfs/go-ipfs-config"`
	`12`	`+ config "github.com/ipfs/go-ipfs/config"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestInitialization(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"testing"`
`8`	`8`
`9`	`9`	`cid "github.com/ipfs/go-cid"`
`10`		`- config "github.com/ipfs/go-ipfs-config"`
`11`	`10`	`files "github.com/ipfs/go-ipfs-files"`
	`11`	`+ config "github.com/ipfs/go-ipfs/config"`
`12`	`12`	`coreapi "github.com/ipfs/go-ipfs/core/coreapi"`
`13`	`13`	`path "github.com/ipfs/go-path"`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`ds "github.com/ipfs/go-datastore"`
`16`	`16`	`dsync "github.com/ipfs/go-datastore/sync"`
`17`		`- cfg "github.com/ipfs/go-ipfs-config"`
	`17`	`+ cfg "github.com/ipfs/go-ipfs/config"`
`18`	`18`	`"github.com/libp2p/go-libp2p-core/crypto"`
`19`	`19`	`peer "github.com/libp2p/go-libp2p-core/peer"`
`20`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package libp2p`
`3`	`3`	`import (`
`4`	`4`	`"time"`
`5`	`5`
`6`		`- config "github.com/ipfs/go-ipfs-config"`
	`6`	`+ config "github.com/ipfs/go-ipfs/config"`
`7`	`7`	`"github.com/libp2p/go-libp2p"`
`8`	`8`	`)`
`9`	`9`