fix(config) failing test
also replace *Datastore with Datastore
Brian Tiger Chow committed
Sep 12, 2014 at 04:20 UTC
a5c0f67c8c3b6f639a539b5e5f8850a7a7e89ecf
5 files changed
+23
-17
cmd/ipfs/init.go
+1
-1
@@ -43,7 +43,7 @@ func initCmd(c *commander.Command, inp []string) error {
43
}
44
cfg := new(config.Config)
45
46
- cfg.Datastore = new(config.Datastore)
46
+ cfg.Datastore = config.Datastore{}
47
dspath, err := u.TildeExpansion("~/.go-ipfs/datastore")
48
if err != nil {
49
return err
config/config.go
+1
-1
@@ -30,7 +30,7 @@ type SavedPeer struct {
30
// Config is used to load IPFS config files.
31
type Config struct {
32
Identity *Identity
33
- Datastore *Datastore
33
+ Datastore Datastore
34
Peers []*SavedPeer
35
}
36
config/config_test.go
+8
-3
@@ -6,12 +6,17 @@ import (
6
)
7
8
func TestConfig(t *testing.T) {
9
-
10
- cfg, err := Load(".ipfsconfig")
9
+ const filename = ".ipfsconfig"
10
+ cfgWritten := new(Config)
11
+ err := WriteConfigFile(filename, cfgWritten)
12
+ if err != nil {
13
+ t.Error(err)
14
+ }
15
+ cfgRead, err := Load(filename)
16
if err != nil {
17
t.Error(err)
18
return
19
}
20
16
- fmt.Printf(cfg.Datastore.Path)
21
+ fmt.Printf(cfgRead.Datastore.Path)
22
}
core/core_test.go
+9
-9
@@ -7,23 +7,23 @@ import (
7
)
8
9
func TestInitialization(t *testing.T) {
10
- id := &config.Identity {
11
- PeerID: "QmNgdzLieYi8tgfo2WfTUzNVH5hQK9oAYGVf6dxN12NrHt",
10
+ id := &config.Identity{
11
+ PeerID: "QmNgdzLieYi8tgfo2WfTUzNVH5hQK9oAYGVf6dxN12NrHt",
12
Address: "/ip4/127.0.0.1/tcp/8000",
13
PrivKey: "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",
14
}
15
16
good := []*config.Config{
17
- &config.Config {
17
+ &config.Config{
18
Identity: id,
19
- Datastore: &config.Datastore{
19
+ Datastore: config.Datastore{
20
Type: "memory",
21
},
22
},
23
24
- &config.Config {
24
+ &config.Config{
25
Identity: id,
26
- Datastore: &config.Datastore {
26
+ Datastore: config.Datastore{
27
Type: "leveldb",
28
Path: ".testdb",
29
},
@@ -31,10 +31,10 @@ func TestInitialization(t *testing.T) {
31
}
32
33
bad := []*config.Config{
34
- &config.Config{Identity: id, Datastore: &config.Datastore{}},
35
- &config.Config{Identity: id, Datastore: &config.Datastore{Type: "badtype"}},
34
+ &config.Config{Identity: id, Datastore: config.Datastore{}},
35
+ &config.Config{Identity: id, Datastore: config.Datastore{Type: "badtype"}},
36
&config.Config{},
37
- &config.Config{Datastore: &config.Datastore{Type: "memory"}},
37
+ &config.Config{Datastore: config.Datastore{Type: "memory"}},
38
nil,
39
}
40
core/datastore.go
+4
-3
@@ -2,13 +2,14 @@ package core
2
3
import (
4
"fmt"
5
+
6
ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
7
lds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/leveldb"
8
config "github.com/jbenet/go-ipfs/config"
9
)
10
10
-func makeDatastore(cfg *config.Datastore) (ds.Datastore, error) {
11
- if cfg == nil || len(cfg.Type) == 0 {
11
+func makeDatastore(cfg config.Datastore) (ds.Datastore, error) {
12
+ if len(cfg.Type) == 0 {
13
return nil, fmt.Errorf("config datastore.type required")
14
}
15
@@ -22,7 +23,7 @@ func makeDatastore(cfg *config.Datastore) (ds.Datastore, error) {
23
return nil, fmt.Errorf("Unknown datastore type: %s", cfg.Type)
24
}
25
25
-func makeLevelDBDatastore(cfg *config.Datastore) (ds.Datastore, error) {
26
+func makeLevelDBDatastore(cfg config.Datastore) (ds.Datastore, error) {
27
if len(cfg.Path) == 0 {
28
return nil, fmt.Errorf("config datastore.path required for leveldb")
29
}