Remove system services and deprecated service sdk

config/config.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"sync"
 	"time"
 
 	"github.com/kelseyhightower/envconfig"
@@ -25,11 +24,6 @@ const (
 	processDBVersion   = "v2"
 )
 
-var (
-	_instance *Config
-	once      sync.Once
-)
-
 // Config contains all the configuration needed.
 type Config struct {
 	Name string
@@ -58,8 +52,6 @@ type Config struct {
 	}
 
 	Cosmos CosmosConfig
-
-	SystemServices []*ServiceConfig
 }
 
 // CosmosConfig is the struct to hold cosmos related configs.
@@ -78,7 +70,7 @@ type CosmosConfig struct {
 }
 
 // New creates a new config with default values.
-func New() (*Config, error) {
+func Default() (*Config, error) {
 	home, err := homedir.Dir()
 	if err != nil {
 		return nil, err
@@ -102,31 +94,25 @@ func New() (*Config, error) {
 	c.Tendermint.Config.P2P.AllowDuplicateIP = true
 	c.Tendermint.Config.Consensus.TimeoutCommit = 10 * time.Second
 
-	return &c, c.setupServices()
+	return &c, nil
 }
 
-// Global returns a singleton of a Config after loaded ENV and validate the values.
-func Global() (*Config, error) {
-	var err error
-	once.Do(func() {
-		_instance, err = New()
-		if err != nil {
-			return
-		}
-		if err = _instance.Load(); err != nil {
-			return
-		}
-		if err = _instance.Prepare(); err != nil {
-			return
-		}
-	})
+// New returns a Config after loaded ENV and validate the values.
+func New() (*Config, error) {
+	c, err := Default()
 	if err != nil {
 		return nil, err
 	}
-	if err := _instance.Validate(); err != nil {
+	if err := c.Load(); err != nil {
+		return nil, err
+	}
+	if err := c.Prepare(); err != nil {
+		return nil, err
+	}
+	if err := c.Validate(); err != nil {
 		return nil, err
 	}
-	return _instance, nil
+	return c, nil
 }
 
 // Load reads config from environmental variables.

config/config_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestDefaultValue(t *testing.T) {
 	home, _ := homedir.Dir()
-	c, err := New()
+	c, err := Default()
 	require.NoError(t, err)
 	require.Equal(t, ":50052", c.Server.Address)
 	require.Equal(t, "text", c.Log.Format)
@@ -24,8 +24,8 @@ func TestDefaultValue(t *testing.T) {
 	require.Equal(t, "engine", c.Name)
 }
 
-func TestGlobal(t *testing.T) {
-	c, err := Global()
+func TestNew(t *testing.T) {
+	c, err := New()
 	require.NoError(t, err)
 	require.NotNil(t, c)
 }
@@ -55,7 +55,7 @@ func TestLoad(t *testing.T) {
 	os.Setenv("MESG_TENDERMINT_P2P_PERSISTENTPEERS", "localhost")
 	os.Setenv("MESG_COSMOS_VALIDATORPUBKEY", "0000000000000000000000000000000000000000000000000000000000000001")
 
-	c, _ := New()
+	c, _ := Default()
 	c.Load()
 	require.Equal(t, "test_server_address", c.Server.Address)
 	require.Equal(t, "test_log_format", c.Log.Format)
@@ -66,14 +66,14 @@ func TestLoad(t *testing.T) {
 }
 
 func TestValidate(t *testing.T) {
-	c, _ := New()
+	c, _ := Default()
 	require.NoError(t, c.Validate())
 
-	c, _ = New()
+	c, _ = Default()
 	c.Log.Format = "wrongValue"
 	require.Error(t, c.Validate())
 
-	c, _ = New()
+	c, _ = Default()
 	c.Log.Level = "wrongValue"
 	require.Error(t, c.Validate())
 }