opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-09-10 14:34:24 +08:00
Code Issues Projects Releases Wiki Activity

Remove Config file section "Datastore", it's not used

Browse Source 
This gives us a clean slate for the new code, avoiding leftovers.

License: MIT
Signed-off-by: Tommi Virtanen <tv@eagain.net>
This commit is contained in:
Tommi Virtanen
2015-05-19 15:32:41 -07:00
committed by Jeromy
parent 2c4a9ab7e4
commit 6996ce6758
3 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
repo/config/config.go
View File

@ -18,7 +18,6 @@ var log = logging.Logger("config")
// Config is used to load IPFS config files. // Config is used to load IPFS config files.
type Config struct { type Config struct {
Identity Identity // local node's peer identity Identity Identity // local node's peer identity
Datastore Datastore // local node's storage
Addresses Addresses // local node's addresses Addresses Addresses // local node's addresses
Mounts Mounts // local node's mount points Mounts Mounts // local node's mount points
Version Version // local node's version management Version Version // local node's version management
@ -30,6 +29,8 @@ type Config struct {
SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled) SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled)
API API // local node's API settings API API // local node's API settings
Swarm SwarmConfig Swarm SwarmConfig
Datastore Datastore
} }
const ( const (

6
repo/config/init.go
View File

@ -11,11 +11,6 @@ import (
) )
func Init(out io.Writer, nBitsForKeypair int) (*Config, error) { func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
ds, err := datastoreConfig()
if err != nil {
return nil, err
}
identity, err := identityConfig(out, nBitsForKeypair) identity, err := identityConfig(out, nBitsForKeypair)
if err != nil { if err != nil {
return nil, err return nil, err
@ -47,7 +42,6 @@ func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
Bootstrap: BootstrapPeerStrings(bootstrapPeers), Bootstrap: BootstrapPeerStrings(bootstrapPeers),
SupernodeRouting: *snr, SupernodeRouting: *snr,
Datastore: *ds,
Identity: identity, Identity: identity,
Discovery: Discovery{MDNS{ Discovery: Discovery{MDNS{
Enabled: true, Enabled: true,

7
repo/fsrepo/serialize/serialize.go
View File

@ -69,12 +69,5 @@ func Load(filename string) (*config.Config, error) {
return nil, err return nil, err
} }
// tilde expansion on datastore path
// TODO why is this here??
cfg.Datastore.Path, err = util.TildeExpansion(cfg.Datastore.Path)
if err != nil {
return nil, err
}
return &cfg, err return &cfg, err
} }