From 8d549f03f3e02ef6c5efad11c9aab969fc6861ed Mon Sep 17 00:00:00 2001 From: Laurent Senta Date: Wed, 2 Mar 2022 14:48:24 +0100 Subject: [PATCH] fix: rewrite dependencies over the go-ipfs-config package --- cmd/ipfs/daemon.go | 4 ++-- cmd/ipfs/init.go | 2 +- cmd/ipfs/main.go | 2 +- cmd/ipfs/pinmfs.go | 2 +- cmd/ipfs/pinmfs_test.go | 2 +- cmd/ipfswatch/main.go | 3 ++- commands/context.go | 2 +- config/serialize/serialize.go | 2 +- config/serialize/serialize_test.go | 2 +- core/commands/bootstrap.go | 2 +- core/commands/cmdenv/env.go | 2 +- core/commands/config.go | 2 +- core/commands/keystore.go | 2 +- core/commands/mount_unix.go | 3 ++- core/commands/pin/remotepin.go | 2 +- core/commands/swarm.go | 2 +- core/core_test.go | 2 +- core/coreapi/test/api_test.go | 6 +++--- core/corehttp/commands.go | 2 +- core/corehttp/gateway_test.go | 2 +- core/corehttp/hostname.go | 2 +- core/corehttp/hostname_test.go | 2 +- core/coreunix/add_test.go | 2 +- core/mock/mock.go | 2 +- core/node/bitswap.go | 2 +- core/node/builder.go | 2 +- core/node/dns.go | 2 +- core/node/groups.go | 2 +- core/node/libp2p/libp2p.go | 2 +- core/node/libp2p/nat.go | 2 +- core/node/libp2p/relay.go | 2 +- core/node/libp2p/sec.go | 2 +- core/node/libp2p/smux.go | 2 +- core/node/libp2p/transport.go | 2 +- core/node/storage.go | 2 +- go.mod | 1 - go.sum | 2 -- package-list.json | 1 - plugin/loader/loader.go | 4 ++-- repo/fsrepo/config_test.go | 2 +- repo/fsrepo/fsrepo.go | 4 ++-- repo/fsrepo/fsrepo_test.go | 2 +- repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go | 2 +- repo/fsrepo/migrations/migrations.go | 2 +- repo/fsrepo/migrations/migrations_test.go | 2 +- repo/fsrepo/misc.go | 2 +- repo/mock.go | 2 +- repo/repo.go | 2 +- test/bench/bench_cli_ipfs_add/main.go | 2 +- test/bench/offline_add/main.go | 2 +- 50 files changed, 54 insertions(+), 56 deletions(-) diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go index 5de7e056e..a2c65b5b9 100644 --- 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 index de3ad1180..dfbf01bb3 100644 --- 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 index d975d1897..11b21c899 100644 --- 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 index 8ea9d2dcc..5eadef5a7 100644 --- 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 index e38e196be..63c8af070 100644 --- 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 index e0bd00e17..f810ada12 100644 --- 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 index e43672eee..984071a05 100644 --- 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 index 04492c5f3..e51e92115 100644 --- 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 index e5abdb852..0c8e12f40 100644 --- 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 index 1aaa64565..d572e8c07 100644 --- 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 index c21612c33..06d401db4 100644 --- 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 index 86037ceb4..7a6e5abaf 100644 --- 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 index 5596ceee0..4f7ca4af8 100644 --- 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 index c6678d175..1c72c6bd9 100644 --- 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 index 0e4bf373e..495a14003 100644 --- 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 index 7c7ee3e81..00899eacb 100644 --- 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 index 051b812c1..e1563789e 100644 --- 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 index 54f3b48ca..5c078558b 100644 --- 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 index c5443f6eb..8de1e6be4 100644 --- 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 index 8cccde0e2..ae0104217 100644 --- 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 index 57c2c2191..6c0ad5bca 100644 --- 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 index f7ba89a8c..df0f4f229 100644 --- 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 index 7dd2b0cec..de326559c 100644 --- 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 index d0a5cd7f6..65c028ac5 100644 --- 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 index a2548ab3c..44698f921 100644 --- 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 index 803caf518..689f151b1 100644 --- 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 index aeec23de1..2fc632763 100644 --- 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 index 80367156e..26b2fae84 100644 --- 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 index 309490bdc..9d864ad46 100644 --- 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 index ce0ca345f..28560662d 100644 --- 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 index 33d958d5c..d30adcfae 100644 --- 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 index bef2efe47..6246d2fe3 100644 --- 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 index 8ce540109..a405e5a32 100644 --- 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 index c5112e9c0..303a70d80 100644 --- 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 index 3e3e90fa1..6a647ffd7 100644 --- 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 index 92c15f6cc..af332571d 100644 --- 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 index e791d5ea3..49abc3cac 100644 --- 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 index 934e5e345..7dfc5648c 100644 --- 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 index 167e1b309..6bf13a370 100644 --- 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 index f7c19c307..0ffdababe 100644 --- 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 index 2aa4a5e46..176ac4618 100644 --- a/repo/fsrepo/fsrepo.go +++ b/repo/fsrepo/fsrepo.go @@ -20,9 +20,9 @@ import ( ds "github.com/ipfs/go-datastore" measure "github.com/ipfs/go-ds-measure" lockfile "github.com/ipfs/go-fs-lock" - config "github.com/ipfs/go-ipfs-config" - serialize "github.com/ipfs/go-ipfs-config/serialize" util "github.com/ipfs/go-ipfs-util" + config "github.com/ipfs/go-ipfs/config" + serialize "github.com/ipfs/go-ipfs/config/serialize" "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" logging "github.com/ipfs/go-log" homedir "github.com/mitchellh/go-homedir" diff --git a/repo/fsrepo/fsrepo_test.go b/repo/fsrepo/fsrepo_test.go index cd2d66618..cf9aeabec 100644 --- a/repo/fsrepo/fsrepo_test.go +++ b/repo/fsrepo/fsrepo_test.go @@ -11,7 +11,7 @@ import ( "github.com/ipfs/go-ipfs/thirdparty/assert" datastore "github.com/ipfs/go-datastore" - config "github.com/ipfs/go-ipfs-config" + config "github.com/ipfs/go-ipfs/config" ) // swap arg order diff --git a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go index 11203ed5a..21a6038a7 100644 --- a/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go +++ b/repo/fsrepo/migrations/ipfsfetcher/ipfsfetcher.go @@ -12,8 +12,8 @@ import ( "strings" "sync" - "github.com/ipfs/go-ipfs-config" files "github.com/ipfs/go-ipfs-files" + "github.com/ipfs/go-ipfs/config" "github.com/ipfs/go-ipfs/core" "github.com/ipfs/go-ipfs/core/coreapi" "github.com/ipfs/go-ipfs/core/node/libp2p" diff --git a/repo/fsrepo/migrations/migrations.go b/repo/fsrepo/migrations/migrations.go index 5eac91b29..726870ea0 100644 --- a/repo/fsrepo/migrations/migrations.go +++ b/repo/fsrepo/migrations/migrations.go @@ -15,7 +15,7 @@ import ( "strings" "sync" - config "github.com/ipfs/go-ipfs-config" + config "github.com/ipfs/go-ipfs/config" ) const ( diff --git a/repo/fsrepo/migrations/migrations_test.go b/repo/fsrepo/migrations/migrations_test.go index 0e52b3a65..2472d4706 100644 --- a/repo/fsrepo/migrations/migrations_test.go +++ b/repo/fsrepo/migrations/migrations_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - config "github.com/ipfs/go-ipfs-config" + config "github.com/ipfs/go-ipfs/config" ) func TestFindMigrations(t *testing.T) { diff --git a/repo/fsrepo/misc.go b/repo/fsrepo/misc.go index 7f0c01640..71b640331 100644 --- a/repo/fsrepo/misc.go +++ b/repo/fsrepo/misc.go @@ -3,7 +3,7 @@ package fsrepo import ( "os" - config "github.com/ipfs/go-ipfs-config" + config "github.com/ipfs/go-ipfs/config" homedir "github.com/mitchellh/go-homedir" ) diff --git a/repo/mock.go b/repo/mock.go index 057649871..15313ab37 100644 --- a/repo/mock.go +++ b/repo/mock.go @@ -7,7 +7,7 @@ import ( filestore "github.com/ipfs/go-filestore" keystore "github.com/ipfs/go-ipfs-keystore" - config "github.com/ipfs/go-ipfs-config" + config "github.com/ipfs/go-ipfs/config" ma "github.com/multiformats/go-multiaddr" ) diff --git a/repo/repo.go b/repo/repo.go index 744bfdf5d..00735eb94 100644 --- a/repo/repo.go +++ b/repo/repo.go @@ -9,7 +9,7 @@ import ( keystore "github.com/ipfs/go-ipfs-keystore" ds "github.com/ipfs/go-datastore" - config "github.com/ipfs/go-ipfs-config" + config "github.com/ipfs/go-ipfs/config" ma "github.com/multiformats/go-multiaddr" ) diff --git a/test/bench/bench_cli_ipfs_add/main.go b/test/bench/bench_cli_ipfs_add/main.go index 727a87aea..b11b5f83c 100644 --- a/test/bench/bench_cli_ipfs_add/main.go +++ b/test/bench/bench_cli_ipfs_add/main.go @@ -12,7 +12,7 @@ import ( "github.com/ipfs/go-ipfs/thirdparty/unit" - config "github.com/ipfs/go-ipfs-config" + config "github.com/ipfs/go-ipfs/config" random "github.com/jbenet/go-random" ) diff --git a/test/bench/offline_add/main.go b/test/bench/offline_add/main.go index 94e8cac23..5d3f27fed 100644 --- a/test/bench/offline_add/main.go +++ b/test/bench/offline_add/main.go @@ -11,7 +11,7 @@ import ( "github.com/ipfs/go-ipfs/thirdparty/unit" - config "github.com/ipfs/go-ipfs-config" + config "github.com/ipfs/go-ipfs/config" random "github.com/jbenet/go-random" )