private: Support latest Constellation configuration format, and maintain backward compatibility (#127)

Author: patrickmn

private/constellation/config.go

@@ -5,19 +5,25 @@ import (
 )
 
 type Config struct {
-	Url            string   `toml:"url"`
-	Port           int      `toml:"port"`
+	Socket         string   `toml:"socket"`
+	PublicKeys     []string `toml:"publickeys"`
+
+	// Deprecated
 	SocketPath     string   `toml:"socketPath"`
-	OtherNodeUrls  []string `toml:"otherNodeUrls"`
 	PublicKeyPath  string   `toml:"publicKeyPath"`
-	PrivateKeyPath string   `toml:"privateKeyPath"`
-	StoragePath    string   `toml:"storagePath"`
 }
 
 func LoadConfig(configPath string) (*Config, error) {
 	cfg := new(Config)
 	if _, err := toml.DecodeFile(configPath, cfg); err != nil {
 		return nil, err
 	}
+	// Fall back to Constellation 0.0.1 config format if necessary
+	if cfg.Socket == "" {
+		cfg.Socket = cfg.SocketPath
+	}
+	if len(cfg.PublicKeys) == 0 {
+		cfg.PublicKeys = append(cfg.PublicKeys, cfg.PublicKeyPath)
+	}
 	return cfg, nil
 }

private/constellation/constellation.go

@@ -56,11 +56,11 @@ func New(configPath string) (*Constellation, error) {
 	if err != nil {
 		return nil, err
 	}
-	err = RunNode(configPath, cfg.SocketPath)
+	err = RunNode(configPath, cfg.Socket)
 	if err != nil {
 		return nil, err
 	}
-	n, err := NewClient(cfg.PublicKeyPath, cfg.SocketPath)
+	n, err := NewClient(cfg.PublicKeys[0], cfg.Socket)
 	if err != nil {
 		return nil, err
 	}