Remove Config file section "Datastore", it's not used
This gives us a clean slate for the new code, avoiding leftovers. License: MIT Signed-off-by: Tommi Virtanen <tv@eagain.net>
Tommi Virtanen committed
May 19, 2015 at 15:32 UTC
6996ce67586b58389b603f06d334d747702b4edf
3 files changed
+2
-14
repo/config/config.go
+2
-1
@@ -18,7 +18,6 @@ var log = logging.Logger("config")
18
// Config is used to load IPFS config files.
19
type Config struct {
20
Identity Identity // local node's peer identity
21
- Datastore Datastore // local node's storage
21
Addresses Addresses // local node's addresses
22
Mounts Mounts // local node's mount points
23
Version Version // local node's version management
@@ -30,6 +29,8 @@ type Config struct {
29
SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled)
30
API API // local node's API settings
31
Swarm SwarmConfig
32
+
33
+ Datastore Datastore
34
}
35
36
const (
repo/config/init.go
-6
@@ -11,11 +11,6 @@ import (
11
)
12
13
func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
14
- ds, err := datastoreConfig()
15
- if err != nil {
16
- return nil, err
17
- }
18
-
14
identity, err := identityConfig(out, nBitsForKeypair)
15
if err != nil {
16
return nil, err
@@ -47,7 +42,6 @@ func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
42
43
Bootstrap: BootstrapPeerStrings(bootstrapPeers),
44
SupernodeRouting: *snr,
50
- Datastore: *ds,
45
Identity: identity,
46
Discovery: Discovery{MDNS{
47
Enabled: true,
repo/fsrepo/serialize/serialize.go
-7
@@ -69,12 +69,5 @@ func Load(filename string) (*config.Config, error) {
69
return nil, err
70
}
71
72
- // tilde expansion on datastore path
73
- // TODO why is this here??
74
- cfg.Datastore.Path, err = util.TildeExpansion(cfg.Datastore.Path)
75
- if err != nil {
76
- return nil, err
77
- }
78
-
72
return &cfg, err
73
}