@cryptotaxi247 / kubo / commits / 6fcd205e2

Update imports to point to go-ipfs-config

License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>

Łukasz Magiera committed Jul 23, 2018 at 16:44 UTC 6fcd205e20c08ec24d61bd616a08832abdb3775d
22 files changed +34 -26
cmd/ipfs/init.go
+1 -1
@@ -14,10 +14,10 @@ import (
14 oldcmds "github.com/ipfs/go-ipfs/commands"
15 core "github.com/ipfs/go-ipfs/core"
16 namesys "github.com/ipfs/go-ipfs/namesys"
17 - config "github.com/ipfs/go-ipfs/repo/config"
17 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
18
19 "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds"
20 + "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
21 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
22 )
23
cmd/ipfs/main.go
+1 -1
@@ -22,7 +22,6 @@ import (
22 corehttp "github.com/ipfs/go-ipfs/core/corehttp"
23 loader "github.com/ipfs/go-ipfs/plugin/loader"
24 repo "github.com/ipfs/go-ipfs/repo"
25 - config "github.com/ipfs/go-ipfs/repo/config"
25 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
26
27 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
@@ -34,6 +33,7 @@ import (
33 "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds/cli"
34 "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds/http"
35 loggables "gx/ipfs/QmcEC2rbyMxUMgpLwt16wquaZdG1aPXcpbKYf4Fedt7hkD/go-libp2p-loggables"
36 + "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
37 )
38
39 // log is the command logger
cmd/ipfswatch/main.go
+1 -1
@@ -13,7 +13,7 @@ import (
13 core "github.com/ipfs/go-ipfs/core"
14 corehttp "github.com/ipfs/go-ipfs/core/corehttp"
15 coreunix "github.com/ipfs/go-ipfs/core/coreunix"
16 - config "github.com/ipfs/go-ipfs/repo/config"
16 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
17 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
18
19 homedir "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
commands/request.go
+1 -1
@@ -9,8 +9,8 @@ import (
9 "github.com/ipfs/go-ipfs/core"
10 coreapi "github.com/ipfs/go-ipfs/core/coreapi"
11 coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
12 - "github.com/ipfs/go-ipfs/repo/config"
12
13 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
14 "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds"
15 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
16 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit/files"
core/bootstrap.go
+1 -1
@@ -9,7 +9,6 @@ import (
9 "sync"
10 "time"
11
12 - config "github.com/ipfs/go-ipfs/repo/config"
12 math2 "github.com/ipfs/go-ipfs/thirdparty/math2"
13 lgbl "gx/ipfs/QmcEC2rbyMxUMgpLwt16wquaZdG1aPXcpbKYf4Fedt7hkD/go-libp2p-loggables"
14
@@ -20,6 +19,7 @@ import (
19 inet "gx/ipfs/QmVwU7Mgwg6qaPn9XXz93ANfq1PTxcduGRzfe41Sygg4mR/go-libp2p-net"
20 pstore "gx/ipfs/QmYLXCWN2myozZpx8Wx4UjrRuQuhY3YtWoMi6SHaXii6aM/go-libp2p-peerstore"
21 peer "gx/ipfs/QmcZSzKEM5yDfpZbeEEZaVmaZ1zXm6JWTbrQZSB8hCVPzk/go-libp2p-peer"
22 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
23 )
24
25 // ErrNotEnoughBootstrapPeers signals that we do not have enough bootstrap
core/builder.go
+2 -2
@@ -12,7 +12,6 @@ import (
12 filestore "github.com/ipfs/go-ipfs/filestore"
13 pin "github.com/ipfs/go-ipfs/pin"
14 repo "github.com/ipfs/go-ipfs/repo"
15 - cfg "github.com/ipfs/go-ipfs/repo/config"
15 cidv0v1 "github.com/ipfs/go-ipfs/thirdparty/cidv0v1"
16 "github.com/ipfs/go-ipfs/thirdparty/verifbs"
17 resolver "gx/ipfs/QmPqCBrmkm7jNfYi7xFS7mUZsrN6DEumBMrxLnL7axNJx1/go-path/resolver"
@@ -34,7 +33,8 @@ import (
33 retry "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore/retrystore"
34 dsync "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore/sync"
35 metrics "gx/ipfs/QmekzFM3hPZjTjUFGTABdQkEnQ3PTiMstY198PwSFr5w1Q/go-metrics-interface"
37 -)
36 + cfg "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
37 + )
38
39 type BuildCfg struct {
40 // If online is set, the node will have networking enabled
core/commands/bootstrap.go
+1 -1
@@ -9,9 +9,9 @@ import (
9 cmds "github.com/ipfs/go-ipfs/commands"
10 e "github.com/ipfs/go-ipfs/core/commands/e"
11 repo "github.com/ipfs/go-ipfs/repo"
12 - config "github.com/ipfs/go-ipfs/repo/config"
12 "github.com/ipfs/go-ipfs/repo/fsrepo"
13
14 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
15 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
16 )
17
core/commands/config.go
+1 -1
@@ -14,9 +14,9 @@ import (
14 cmds "github.com/ipfs/go-ipfs/commands"
15 e "github.com/ipfs/go-ipfs/core/commands/e"
16 repo "github.com/ipfs/go-ipfs/repo"
17 - config "github.com/ipfs/go-ipfs/repo/config"
17 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
18
19 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
20 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
21 )
22
core/commands/env.go
+1 -1
@@ -6,9 +6,9 @@ import (
6 "github.com/ipfs/go-ipfs/commands"
7 "github.com/ipfs/go-ipfs/core"
8 coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
9 - "github.com/ipfs/go-ipfs/repo/config"
9
10 cmds "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds"
11 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
12 )
13
14 // GetNode extracts the node from the environment.
core/commands/mount_unix.go
+1 -1
@@ -10,8 +10,8 @@ import (
10 cmds "github.com/ipfs/go-ipfs/commands"
11 e "github.com/ipfs/go-ipfs/core/commands/e"
12 nodeMount "github.com/ipfs/go-ipfs/fuse/node"
13 - config "github.com/ipfs/go-ipfs/repo/config"
13
14 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
15 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
16 )
17
core/commands/repo.go
+1 -1
@@ -13,11 +13,11 @@ import (
13 lgc "github.com/ipfs/go-ipfs/commands/legacy"
14 e "github.com/ipfs/go-ipfs/core/commands/e"
15 corerepo "github.com/ipfs/go-ipfs/core/corerepo"
16 - config "github.com/ipfs/go-ipfs/repo/config"
16 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
17
18 bstore "gx/ipfs/QmRNFh4wm6FgTDrtsWmnvEP9NTuEa3Ykf72y1LXCyevbGW/go-ipfs-blockstore"
19 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
20 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
21 cmds "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds"
22 cmdkit "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
23 )
core/commands/swarm.go
+1 -1
@@ -12,7 +12,6 @@ import (
12 cmds "github.com/ipfs/go-ipfs/commands"
13 e "github.com/ipfs/go-ipfs/core/commands/e"
14 repo "github.com/ipfs/go-ipfs/repo"
15 - config "github.com/ipfs/go-ipfs/repo/config"
15 "github.com/ipfs/go-ipfs/repo/fsrepo"
16
17 iaddr "gx/ipfs/QmNysBQN8FUSE2TKUYRFiMrn7Fiqk5RPeCz33cKaLa6syn/go-ipfs-addr"
@@ -21,6 +20,7 @@ import (
20 pstore "gx/ipfs/QmYLXCWN2myozZpx8Wx4UjrRuQuhY3YtWoMi6SHaXii6aM/go-libp2p-peerstore"
21 ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
22 peer "gx/ipfs/QmcZSzKEM5yDfpZbeEEZaVmaZ1zXm6JWTbrQZSB8hCVPzk/go-libp2p-peer"
23 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
24 cmdkit "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
25 swarm "gx/ipfs/QmdjC8HtKZpEufBL1u7WxvQn78Lqq2Wk31NJS8WvFX3crB/go-libp2p-swarm"
26 )
core/commands/sysdiag.go
+1 -1
@@ -6,10 +6,10 @@ import (
6 "runtime"
7
8 cmds "github.com/ipfs/go-ipfs/commands"
9 - config "github.com/ipfs/go-ipfs/repo/config"
9
10 manet "gx/ipfs/QmV6FjemM1K8oXjrvuq3wuVWWoU2TLDPmNnKrxHzY3v6Ai/go-multiaddr-net"
11 sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo"
12 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
13 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
14 )
15
core/commands/version.go
+2 -1
@@ -8,8 +8,9 @@ import (
8
9 cmds "github.com/ipfs/go-ipfs/commands"
10 e "github.com/ipfs/go-ipfs/core/commands/e"
11 - config "github.com/ipfs/go-ipfs/repo/config"
11 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
12 +
13 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
14 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
15 )
16
core/core.go
+3 -3
@@ -29,14 +29,13 @@ import (
29 p2p "github.com/ipfs/go-ipfs/p2p"
30 pin "github.com/ipfs/go-ipfs/pin"
31 repo "github.com/ipfs/go-ipfs/repo"
32 - config "github.com/ipfs/go-ipfs/repo/config"
32 +
33 bitswap "gx/ipfs/QmNQQEYL3Vpj4beteqyeRpVpivuX1wBP6Q5GZMdBPPTV3S/go-bitswap"
34 bsnet "gx/ipfs/QmNQQEYL3Vpj4beteqyeRpVpivuX1wBP6Q5GZMdBPPTV3S/go-bitswap/network"
35 "gx/ipfs/QmPqCBrmkm7jNfYi7xFS7mUZsrN6DEumBMrxLnL7axNJx1/go-path/resolver"
36 ft "gx/ipfs/QmWJRM6rLjXGEXb5JkKu17Y68eJtCFcKPyRhb8JH2ELZ2Q/go-unixfs"
37 merkledag "gx/ipfs/QmXkZeJmx4c3ddjw81DQMUpM1e5LjAack5idzZYWUb2qAJ/go-merkledag"
38 bserv "gx/ipfs/QmeZMtdkNG7u2CohGSL8mzAdZY2c3B1coYE91wvbzip1pF/go-blockservice"
39 -
39 circuit "gx/ipfs/QmPMRK5yTc2KhnaxQN4R7vRqEfZo5hW1aF5x6W97RKnXZq/go-libp2p-circuit"
40 u "gx/ipfs/QmPdKqUcHGFdeSpvjVoaTRPPstGif9GBZb5Q56RVw9o69A/go-ipfs-util"
41 ic "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
@@ -75,7 +74,8 @@ import (
74 ifconnmgr "gx/ipfs/QmeJbAMK4cZc1RMChb68h9t2jqvK8miqE8oQiwGAf4EdQq/go-libp2p-interface-connmgr"
75 ds "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore"
76 routing "gx/ipfs/QmewrvpGvgK9qkCtXsGNwXiQzyux4jcHNjoyVrGdsgtNK5/go-libp2p-routing"
78 -)
77 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
78 + )
79
80 const IpnsValidatorTag = "ipns"
81
core/corehttp/commands.go
+2 -2
@@ -12,11 +12,11 @@ import (
12 oldcmds "github.com/ipfs/go-ipfs/commands"
13 core "github.com/ipfs/go-ipfs/core"
14 corecommands "github.com/ipfs/go-ipfs/core/commands"
15 - config "github.com/ipfs/go-ipfs/repo/config"
16 - path "gx/ipfs/QmPqCBrmkm7jNfYi7xFS7mUZsrN6DEumBMrxLnL7axNJx1/go-path"
15
16 + path "gx/ipfs/QmPqCBrmkm7jNfYi7xFS7mUZsrN6DEumBMrxLnL7axNJx1/go-path"
17 cmds "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds"
18 cmdsHttp "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds/http"
19 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
20 )
21
22 var (
core/corehttp/gateway.go
+1 -1
@@ -7,9 +7,9 @@ import (
7
8 core "github.com/ipfs/go-ipfs/core"
9 coreapi "github.com/ipfs/go-ipfs/core/coreapi"
10 - config "github.com/ipfs/go-ipfs/repo/config"
10
11 id "gx/ipfs/QmUDzeFgYrRmHL2hUB6NZmqcBVQtUzETwmFRUc9onfSSHr/go-libp2p/p2p/protocol/identify"
12 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
13 )
14
15 type GatewayConfig struct {
package.json
+6
@@ -575,6 +575,12 @@
575 "hash": "QmWJRM6rLjXGEXb5JkKu17Y68eJtCFcKPyRhb8JH2ELZ2Q",
576 "name": "go-unixfs",
577 "version": "1.0.6"
578 + },
579 + {
580 + "author": "magik6k",
581 + "hash": "QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU",
582 + "name": "go-ipfs-config",
583 + "version": "0.1.0"
584 }
585 ],
586 "gxVersion": "0.10.0",
repo/fsrepo/fsrepo.go
+2 -2
@@ -15,9 +15,7 @@ import (
15 keystore "github.com/ipfs/go-ipfs/keystore"
16 repo "github.com/ipfs/go-ipfs/repo"
17 "github.com/ipfs/go-ipfs/repo/common"
18 - config "github.com/ipfs/go-ipfs/repo/config"
18 mfsr "github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
20 - serialize "github.com/ipfs/go-ipfs/repo/config/serialize"
19 dir "github.com/ipfs/go-ipfs/thirdparty/dir"
20
21 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
@@ -27,6 +25,8 @@ import (
25 logging "gx/ipfs/QmRREK2CAZ5Re2Bd9zZFG6FeYDppUWt5cMgsoUEp3ktgSr/go-log"
26 ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
27 lockfile "gx/ipfs/QmZzgxSj8QpR58KmdeNj97eD66X6xeDAFNjpP2xTY9oKeQ/go-fs-lock"
28 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
29 + serialize "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config/serialize"
30 ds "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore"
31 )
32
repo/fsrepo/misc.go
+2 -1
@@ -4,7 +4,8 @@ import (
4 "os"
5
6 homedir "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
7 - "github.com/ipfs/go-ipfs/repo/config"
7 +
8 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
9 )
10
11 // BestKnownPath returns the best known fsrepo path. If the ENV override is
repo/mock.go
+1 -1
@@ -5,9 +5,9 @@ import (
5
6 filestore "github.com/ipfs/go-ipfs/filestore"
7 keystore "github.com/ipfs/go-ipfs/keystore"
8 - "github.com/ipfs/go-ipfs/repo/config"
8
9 ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
10 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
11 )
12
13 var errTODO = errors.New("TODO: mock repo")
repo/repo.go
+1 -1
@@ -6,9 +6,9 @@ import (
6
7 filestore "github.com/ipfs/go-ipfs/filestore"
8 keystore "github.com/ipfs/go-ipfs/keystore"
9 - config "github.com/ipfs/go-ipfs/repo/config"
9
10 ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
11 + config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
12 ds "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore"
13 )
14