@cryptotaxi247 / kubo / commits / b65cf84a3

repo: move version.go back here

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

Łukasz Magiera committed Jul 23, 2018 at 19:11 UTC b65cf84a34508761e610cc4ab37b5e636bdbcc51
37 files changed +67 -54
cmd/ipfs/Rules.mk
+1 -1
@@ -13,7 +13,7 @@ PATH := $(realpath $(d)):$(PATH)
13 # DEPS_OO_$(d) += merkledag/pb/merkledag.pb.go namesys/pb/namesys.pb.go
14 # DEPS_OO_$(d) += pin/internal/pb/header.pb.go unixfs/pb/unixfs.pb.go
15
16 -$(d)_flags =-ldflags="-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(git-hash)"
16 +$(d)_flags =-ldflags="-X "github.com/ipfs/go-ipfs/repo".CurrentCommit=$(git-hash)"
17
18 $(d)-try-build $(IPFS_BIN_$(d)): GOFLAGS += $(cmd/ipfs_flags)
19
cmd/ipfs/init.go
+1 -1
@@ -17,7 +17,7 @@ import (
17 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
18
19 "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds"
20 - "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
20 + "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
21 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
22 )
23
cmd/ipfs/main.go
+1 -1
@@ -33,7 +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"
36 + "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
37 )
38
39 // log is the command logger
cmd/ipfswatch/main.go
+1 -1
@@ -13,8 +13,8 @@ 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 "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
16 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
17 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
18
19 homedir "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
20
commands/request.go
+1 -1
@@ -10,7 +10,7 @@ import (
10 coreapi "github.com/ipfs/go-ipfs/core/coreapi"
11 coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
12
13 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
13 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/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
@@ -19,7 +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"
22 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
23 )
24
25 // ErrNotEnoughBootstrapPeers signals that we do not have enough bootstrap
core/bootstrap_test.go
+1 -1
@@ -4,9 +4,9 @@ import (
4 "fmt"
5 "testing"
6
7 - config "github.com/ipfs/go-ipfs/repo/config"
7 testutil "gx/ipfs/QmXG74iiKQnDstVQq9fPFQEB6JTNSWBbAWE1qsq6L4E5sR/go-testutil"
8 pstore "gx/ipfs/QmYLXCWN2myozZpx8Wx4UjrRuQuhY3YtWoMi6SHaXii6aM/go-libp2p-peerstore"
9 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
10 )
11
12 func TestSubsetWhenMaxIsGreaterThanLengthOfSlice(t *testing.T) {
core/builder.go
+1 -1
@@ -33,7 +33,7 @@ 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"
36 - cfg "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
36 + cfg "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
37 )
38
39 type BuildCfg struct {
core/commands/bootstrap.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 repo "github.com/ipfs/go-ipfs/repo"
12 "github.com/ipfs/go-ipfs/repo/fsrepo"
13
14 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
14 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
15 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
16 )
17
core/commands/config.go
+1 -1
@@ -16,7 +16,7 @@ import (
16 repo "github.com/ipfs/go-ipfs/repo"
17 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
18
19 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
19 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
20 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
21 )
22
core/commands/env.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
9
10 cmds "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds"
11 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
11 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
12 )
13
14 // GetNode extracts the node from the environment.
core/commands/mount_unix.go
+1 -1
@@ -11,7 +11,7 @@ import (
11 e "github.com/ipfs/go-ipfs/core/commands/e"
12 nodeMount "github.com/ipfs/go-ipfs/fuse/node"
13
14 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
14 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
15 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
16 )
17
core/commands/repo.go
+1 -1
@@ -17,7 +17,7 @@ import (
17
18 bstore "gx/ipfs/QmRNFh4wm6FgTDrtsWmnvEP9NTuEa3Ykf72y1LXCyevbGW/go-ipfs-blockstore"
19 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
20 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
20 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/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
@@ -20,7 +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"
23 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
24 cmdkit "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
25 swarm "gx/ipfs/QmdjC8HtKZpEufBL1u7WxvQn78Lqq2Wk31NJS8WvFX3crB/go-libp2p-swarm"
26 )
core/commands/sysdiag.go
+3 -3
@@ -6,10 +6,10 @@ import (
6 "runtime"
7
8 cmds "github.com/ipfs/go-ipfs/commands"
9 + "github.com/ipfs/go-ipfs/repo"
10
11 manet "gx/ipfs/QmV6FjemM1K8oXjrvuq3wuVWWoU2TLDPmNnKrxHzY3v6Ai/go-multiaddr-net"
12 sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo"
12 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
13 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
14 )
15
@@ -57,8 +57,8 @@ Prints out information about your computer to aid in easier debugging.
57 return
58 }
59
60 - info["ipfs_version"] = config.CurrentVersionNumber
61 - info["ipfs_commit"] = config.CurrentCommit
60 + info["ipfs_version"] = repo.CurrentVersionNumber
61 + info["ipfs_commit"] = repo.CurrentCommit
62 res.SetOutput(info)
63 },
64 }
core/commands/version.go
+3 -3
@@ -8,9 +8,9 @@ import (
8
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 fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
13
13 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
14 "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit"
15 )
16
@@ -36,8 +36,8 @@ var VersionCmd = &cmds.Command{
36 },
37 Run: func(req cmds.Request, res cmds.Response) {
38 res.SetOutput(&VersionOutput{
39 - Version: config.CurrentVersionNumber,
40 - Commit: config.CurrentCommit,
39 + Version: repo.CurrentVersionNumber,
40 + Commit: repo.CurrentCommit,
41 Repo: fmt.Sprint(fsrepo.RepoVersion),
42 System: runtime.GOARCH + "/" + runtime.GOOS, //TODO: Precise version here
43 Golang: runtime.Version(),
core/core.go
+2 -2
@@ -74,7 +74,7 @@ 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"
77 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
77 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
78 )
79
80 const IpnsValidatorTag = "ipns"
@@ -94,7 +94,7 @@ const (
94 )
95
96 func init() {
97 - identify.ClientVersion = "go-ipfs/" + config.CurrentVersionNumber + "/" + config.CurrentCommit
97 + identify.ClientVersion = "go-ipfs/" + repo.CurrentVersionNumber + "/" + repo.CurrentCommit
98 }
99
100 // IpfsNode is IPFS Core module. It represents an IPFS instance.
core/core_test.go
+1 -1
@@ -6,8 +6,8 @@ import (
6 context "context"
7
8 "github.com/ipfs/go-ipfs/repo"
9 - config "github.com/ipfs/go-ipfs/repo/config"
9
10 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
11 datastore "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore"
12 syncds "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore/sync"
13 )
core/coreapi/unixfs_test.go
+2 -2
@@ -16,10 +16,10 @@ import (
16 coreunix "github.com/ipfs/go-ipfs/core/coreunix"
17 keystore "github.com/ipfs/go-ipfs/keystore"
18 repo "github.com/ipfs/go-ipfs/repo"
19 - config "github.com/ipfs/go-ipfs/repo/config"
19 +
20 unixfs "gx/ipfs/QmWJRM6rLjXGEXb5JkKu17Y68eJtCFcKPyRhb8JH2ELZ2Q/go-unixfs"
21 mdag "gx/ipfs/QmXkZeJmx4c3ddjw81DQMUpM1e5LjAack5idzZYWUb2qAJ/go-merkledag"
22 -
22 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
23 ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
24 cbor "gx/ipfs/QmWrbExtUaQQHjJ8FVVDAWj5o1MRAELDUV3VmoQsZHHb6L/go-ipld-cbor"
25 peer "gx/ipfs/QmcZSzKEM5yDfpZbeEEZaVmaZ1zXm6JWTbrQZSB8hCVPzk/go-libp2p-peer"
core/corehttp/commands.go
+4 -3
@@ -12,11 +12,12 @@ 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 + repo "github.com/ipfs/go-ipfs/repo"
16
17 path "gx/ipfs/QmPqCBrmkm7jNfYi7xFS7mUZsrN6DEumBMrxLnL7axNJx1/go-path"
18 cmds "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds"
19 cmdsHttp "gx/ipfs/QmbWGdyATxHpmbDC2z7zMNnmPmiHCRXS5f2vyxBfgz8bVb/go-ipfs-cmds/http"
19 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
20 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
21 )
22
23 var (
@@ -77,7 +78,7 @@ func addHeadersFromConfig(c *cmdsHttp.ServerConfig, nc *config.Config) {
78 for h, v := range nc.API.HTTPHeaders {
79 c.Headers[h] = v
80 }
80 - c.Headers["Server"] = []string{"go-ipfs/" + config.CurrentVersionNumber}
81 + c.Headers["Server"] = []string{"go-ipfs/" + repo.CurrentVersionNumber}
82 }
83
84 func addCORSDefaults(c *cmdsHttp.ServerConfig) {
@@ -152,7 +153,7 @@ func CommandsROOption(cctx oldcmds.Context) ServeOption {
153
154 // CheckVersionOption returns a ServeOption that checks whether the client ipfs version matches. Does nothing when the user agent string does not contain `/go-ipfs/`
155 func CheckVersionOption() ServeOption {
155 - daemonVersion := config.ApiVersion
156 + daemonVersion := repo.ApiVersion
157
158 return ServeOption(func(n *core.IpfsNode, l net.Listener, parent *http.ServeMux) (*http.ServeMux, error) {
159 mux := http.NewServeMux()
core/corehttp/gateway.go
+2 -2
@@ -7,9 +7,9 @@ import (
7
8 core "github.com/ipfs/go-ipfs/core"
9 coreapi "github.com/ipfs/go-ipfs/core/coreapi"
10 + repo "github.com/ipfs/go-ipfs/repo"
11
12 id "gx/ipfs/QmUDzeFgYrRmHL2hUB6NZmqcBVQtUzETwmFRUc9onfSSHr/go-libp2p/p2p/protocol/identify"
12 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
13 )
14
15 type GatewayConfig struct {
@@ -41,7 +41,7 @@ func GatewayOption(writable bool, paths ...string) ServeOption {
41 func VersionOption() ServeOption {
42 return func(_ *core.IpfsNode, _ net.Listener, mux *http.ServeMux) (*http.ServeMux, error) {
43 mux.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {
44 - fmt.Fprintf(w, "Commit: %s\n", config.CurrentCommit)
44 + fmt.Fprintf(w, "Commit: %s\n", repo.CurrentCommit)
45 fmt.Fprintf(w, "Client Version: %s\n", id.ClientVersion)
46 fmt.Fprintf(w, "Protocol Version: %s\n", id.LibP2PVersion)
47 })
core/corehttp/gateway_test.go
+3 -3
@@ -16,12 +16,12 @@ import (
16 namesys "github.com/ipfs/go-ipfs/namesys"
17 nsopts "github.com/ipfs/go-ipfs/namesys/opts"
18 repo "github.com/ipfs/go-ipfs/repo"
19 - config "github.com/ipfs/go-ipfs/repo/config"
19 +
20 path "gx/ipfs/QmPqCBrmkm7jNfYi7xFS7mUZsrN6DEumBMrxLnL7axNJx1/go-path"
21 dag "gx/ipfs/QmXkZeJmx4c3ddjw81DQMUpM1e5LjAack5idzZYWUb2qAJ/go-merkledag"
22 -
22 ci "gx/ipfs/QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n/go-libp2p-crypto"
23 id "gx/ipfs/QmUDzeFgYrRmHL2hUB6NZmqcBVQtUzETwmFRUc9onfSSHr/go-libp2p/p2p/protocol/identify"
24 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
25 datastore "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore"
26 syncds "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore/sync"
27 )
@@ -545,7 +545,7 @@ func TestGoGetSupport(t *testing.T) {
545 }
546
547 func TestVersion(t *testing.T) {
548 - config.CurrentCommit = "theshortcommithash"
548 + repo.CurrentCommit = "theshortcommithash"
549
550 ns := mockNamesys{}
551 ts, _ := newTestServerAndNode(t, ns)
core/corehttp/option_test.go
+3 -3
@@ -7,7 +7,7 @@ import (
7 "net/http/httptest"
8 "testing"
9
10 - config "github.com/ipfs/go-ipfs/repo/config"
10 + "github.com/ipfs/go-ipfs/repo"
11 )
12
13 type testcasecheckversion struct {
@@ -20,7 +20,7 @@ type testcasecheckversion struct {
20
21 func (tc testcasecheckversion) body() string {
22 if !tc.shouldHandle && tc.responseBody == "" {
23 - return fmt.Sprintf("%s (%s != %s)\n", errAPIVersionMismatch, config.ApiVersion, tc.userAgent)
23 + return fmt.Sprintf("%s (%s != %s)\n", errAPIVersionMismatch, repo.ApiVersion, tc.userAgent)
24 }
25
26 return tc.responseBody
@@ -30,7 +30,7 @@ func TestCheckVersionOption(t *testing.T) {
30 tcs := []testcasecheckversion{
31 {"/go-ipfs/0.1/", APIPath + "/test/", false, "", http.StatusBadRequest},
32 {"/go-ipfs/0.1/", APIPath + "/version", true, "check!", http.StatusOK},
33 - {config.ApiVersion, APIPath + "/test", true, "check!", http.StatusOK},
33 + {repo.ApiVersion, APIPath + "/test", true, "check!", http.StatusOK},
34 {"Mozilla Firefox/no go-ipfs node", APIPath + "/test", true, "check!", http.StatusOK},
35 {"/go-ipfs/0.1/", "/webui", true, "check!", http.StatusOK},
36 }
core/coreunix/add_test.go
+2 -2
@@ -13,12 +13,12 @@ import (
13 "github.com/ipfs/go-ipfs/core"
14 "github.com/ipfs/go-ipfs/pin/gc"
15 "github.com/ipfs/go-ipfs/repo"
16 - "github.com/ipfs/go-ipfs/repo/config"
16 +
17 dag "gx/ipfs/QmXkZeJmx4c3ddjw81DQMUpM1e5LjAack5idzZYWUb2qAJ/go-merkledag"
18 "gx/ipfs/QmeZMtdkNG7u2CohGSL8mzAdZY2c3B1coYE91wvbzip1pF/go-blockservice"
19 -
19 blockstore "gx/ipfs/QmRNFh4wm6FgTDrtsWmnvEP9NTuEa3Ykf72y1LXCyevbGW/go-ipfs-blockstore"
20 pi "gx/ipfs/QmSHjPDw8yNgLZ7cBfX7w3Smn7PHwYhNEpd4LHQQxUg35L/go-ipfs-posinfo"
21 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
22 blocks "gx/ipfs/QmVzK524a2VWLqyvtBeiHKsUAWYgeAk4DBeZoY7vpNPNRx/go-block-format"
23 cid "gx/ipfs/QmYVNvtQkeZ6AKSwDrjQTs432QtL6umrrK41EBq3cu7iSP/go-cid"
24 files "gx/ipfs/QmdE4gMduCKCGAcczM2F5ioYDfdeKuPix138wrES1YSr7f/go-ipfs-cmdkit/files"
core/mock/mock.go
+1 -1
@@ -6,7 +6,6 @@ import (
6 commands "github.com/ipfs/go-ipfs/commands"
7 core "github.com/ipfs/go-ipfs/core"
8 "github.com/ipfs/go-ipfs/repo"
9 - config "github.com/ipfs/go-ipfs/repo/config"
9
10 host "gx/ipfs/QmQ1hwb95uSSZR8jSPJysnfHxBDQAykSXsmz5TwTzxjq2Z/go-libp2p-host"
11 libp2p "gx/ipfs/QmUDzeFgYrRmHL2hUB6NZmqcBVQtUzETwmFRUc9onfSSHr/go-libp2p"
@@ -14,6 +13,7 @@ import (
13 testutil "gx/ipfs/QmXG74iiKQnDstVQq9fPFQEB6JTNSWBbAWE1qsq6L4E5sR/go-testutil"
14 pstore "gx/ipfs/QmYLXCWN2myozZpx8Wx4UjrRuQuhY3YtWoMi6SHaXii6aM/go-libp2p-peerstore"
15 peer "gx/ipfs/QmcZSzKEM5yDfpZbeEEZaVmaZ1zXm6JWTbrQZSB8hCVPzk/go-libp2p-peer"
16 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
17 datastore "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore"
18 syncds "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore/sync"
19 )
docs/releases.md
+3 -3
@@ -9,7 +9,7 @@ will be allowed up to release day.
9 ## Release Candidate Checklist
10 - [ ] CHANGELOG.md has been updated
11 - use `./bin/mkreleaselog` to generate a nice starter list
12 -- [ ] version string in `repo/config/version.go` has been updated
12 +- [ ] version string in `repo/version.go` has been updated
13 - [ ] tag commit with vX.Y.Z-rcN
14 - [ ] publish gx version with `gx publish`, as per [gx release guidelines](https://github.com/whyrusleeping/gx#publishing-and-releasing)
15 - you will have to manually adjust the gx version to 'rc'
@@ -22,7 +22,7 @@ will be allowed up to release day.
22 - [ ] webui works (for most definitions of 'works') - Test the multiple pages and verify that no visible errors are shown.
23 - [ ] CHANGELOG.md has been updated
24 - use `./bin/mkreleaselog` to generate a nice starter list
25 -- [ ] version string in `repo/config/version.go` has been updated
25 +- [ ] version string in `repo/version.go` has been updated
26 - [ ] tag commit with vX.Y.Z
27 - [ ] update release branch to point to release commit
28 - [ ] publish dist.ipfs.io
@@ -30,7 +30,7 @@ will be allowed up to release day.
30 - [ ] publish gx version with `gx release`, as per [gx release guidelines](https://github.com/whyrusleeping/gx#publishing-and-releasing)
31
32 ## Post-Release
33 -- [ ] Bump version string in `repo/config/version.go` to `vX.Y.Z-dev`
33 +- [ ] bump version string in `repo/version.go` to `vX.Y.Z-dev`
34 - [ ] Upload the final release to the github releases page: https://github.com/ipfs/go-ipfs/releases
35 - Communication
36 - [ ] Create the release issue
docs/windows.md
+1 -1
@@ -130,7 +130,7 @@ We need the `git` commit hash to be included in our build so that in the extreme
130
131 Finally, we'll build and test `ipfs` itself.
132 ```
133 -go install -ldflags="-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=%SHA%"
133 +go install -ldflags="-X "github.com/ipfs/go-ipfs/repo".CurrentCommit=%SHA%"
134 %GOPATH%\bin\ipfs.exe version --all
135 ```
136 You can check that the ipfs output versions match with `go version` and `git rev-parse --short HEAD`.
package.json
+2 -2
@@ -578,9 +578,9 @@
578 },
579 {
580 "author": "magik6k",
581 - "hash": "QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU",
581 + "hash": "QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL",
582 "name": "go-ipfs-config",
583 - "version": "0.1.0"
583 + "version": "0.2.0"
584 }
585 ],
586 "gxVersion": "0.10.0",
repo/fsrepo/config_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7 "reflect"
8 "testing"
9
10 - config "github.com/ipfs/go-ipfs/repo/config"
10 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
11 )
12
13 // note: to test sorting of the mountpoints in the disk spec they are
repo/fsrepo/fsrepo.go
+2 -2
@@ -25,8 +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"
28 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
29 + serialize "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config/serialize"
30 ds "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore"
31 )
32
repo/fsrepo/fsrepo_test.go
+2 -1
@@ -7,8 +7,9 @@ import (
7 "path/filepath"
8 "testing"
9
10 - "github.com/ipfs/go-ipfs/repo/config"
10 "github.com/ipfs/go-ipfs/thirdparty/assert"
11 +
12 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
13 datastore "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore"
14 )
15
repo/fsrepo/misc.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 homedir "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/mitchellh/go-homedir"
7
8 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
8 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
9 )
10
11 // BestKnownPath returns the best known fsrepo path. If the ENV override is
repo/mock.go
+1 -1
@@ -6,8 +6,8 @@ import (
6 filestore "github.com/ipfs/go-ipfs/filestore"
7 keystore "github.com/ipfs/go-ipfs/keystore"
8
9 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
10 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
@@ -7,8 +7,8 @@ import (
7 filestore "github.com/ipfs/go-ipfs/filestore"
8 keystore "github.com/ipfs/go-ipfs/keystore"
9
10 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
11 ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
11 - config "gx/ipfs/QmbfPqH4QFLQWdfXa111eBKgdTiLkZv2Pc4Qpm2byUeByU/go-ipfs-config"
12 ds "gx/ipfs/QmeiCcJfDW1GJnWUArudsv5rQsihpi4oyddPhdqo3CfX6i/go-datastore"
13 )
14
repo/version.go new
+9
@@ -0,0 +1,9 @@
1 +package repo
2 +
3 +// CurrentCommit is the current git commit, this is set as a ldflag in the Makefile
4 +var CurrentCommit string
5 +
6 +// CurrentVersionNumber is the current application's version literal
7 +const CurrentVersionNumber = "0.4.17-dev"
8 +
9 +const ApiVersion = "/go-ipfs/" + CurrentVersionNumber + "/"
test/bench/bench_cli_ipfs_add/main.go
+2 -1
@@ -11,8 +11,9 @@ import (
11 "testing"
12
13 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
14 - "github.com/ipfs/go-ipfs/repo/config"
14 "github.com/ipfs/go-ipfs/thirdparty/unit"
15 +
16 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
17 )
18
19 var (
test/bench/offline_add/main.go
+2 -1
@@ -10,8 +10,9 @@ import (
10 "testing"
11
12 "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random"
13 - "github.com/ipfs/go-ipfs/repo/config"
13 "github.com/ipfs/go-ipfs/thirdparty/unit"
14 +
15 + config "gx/ipfs/QmSzU7M24odFR3icDsAK8P8SQoaELzDFv3n3fTPy2grrEL/go-ipfs-config"
16 )
17
18 func main() {