Merge pull request #47 from dedis/dbfolder

fix db folder path
drand · Jul 4, 2018 · 4730bb0 · 4730bb0
2 parents 7cad903 + 6c6e6f7
commit 4730bb0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/beacon/beacon_test.go b/beacon/beacon_test.go
@@ -291,7 +291,7 @@ func TestBeaconNEqualT(t *testing.T) {
 	}
 
 	seed := []byte("Sunshine in a bottle")
-	period := time.Duration(600) * time.Millisecond
+	period := time.Duration(1000) * time.Millisecond
 
 	// storing beacons from all nodes indexed per round
 	genBeacons := make(map[uint64][]*Beacon)

diff --git a/key/store.go b/key/store.go
@@ -104,7 +104,7 @@ func (f *fileStore) SaveGroup(g *Group) error {
 }
 
 func (f *fileStore) SaveShare(share *Share) error {
-	slog.Info("cryptostore: saving private share in ", f.shareFile)
+	slog.Info("crypto store: saving private share in ", f.shareFile)
 	return Save(f.shareFile, share, true)
 }
 
@@ -114,7 +114,7 @@ func (f *fileStore) LoadShare() (*Share, error) {
 }
 
 func (f *fileStore) SaveDistPublic(d *DistPublic) error {
-	slog.Info("fileStore saving public distributed key in ", f.distKeyFile)
+	slog.Info("crypto store: saving public distributed key in ", f.distKeyFile)
 	return Save(f.distKeyFile, d, false)
 }
 

diff --git a/main.go b/main.go
@@ -411,7 +411,7 @@ func contextToConfig(c *cli.Context) *core.Config {
 
 	config := c.GlobalString("config")
 	opts = append(opts, core.WithConfigFolder(config))
-	db := c.GlobalString("db")
+	db := path.Join(config, c.GlobalString("db"))
 	opts = append(opts, core.WithDbFolder(db))
 	period := c.Duration("period")
 	opts = append(opts, core.WithBeaconPeriod(period))