Engine pre-merge changes (thrasher-corp#392)

* Engine pre merge changes

* Remove redundant "seconds"

.gitignore

@@ -5,6 +5,7 @@ lib
 .vscode
 
 testdata/dump
+testdata/preengine_config.json
 testdata/writefiletest
 
 # InteliJ

config/config.go

@@ -665,26 +665,6 @@ func (c *Config) CountEnabledExchanges() int {
 	return counter
 }
 
-// GetConfigCurrencyPairFormat returns the config currency pair format
-// for a specific exchange
-func (c *Config) GetConfigCurrencyPairFormat(exchName string) (*currency.PairFormat, error) {
-	exchCfg, err := c.GetExchangeConfig(exchName)
-	if err != nil {
-		return nil, err
-	}
-	return exchCfg.ConfigCurrencyPairFormat, nil
-}
-
-// GetRequestCurrencyPairFormat returns the request currency pair format
-// for a specific exchange
-func (c *Config) GetRequestCurrencyPairFormat(exchName string) (*currency.PairFormat, error) {
-	exchCfg, err := c.GetExchangeConfig(exchName)
-	if err != nil {
-		return nil, err
-	}
-	return exchCfg.RequestCurrencyPairFormat, nil
-}
-
 // GetCurrencyPairDisplayConfig retrieves the currency pair display preference
 func (c *Config) GetCurrencyPairDisplayConfig() *CurrencyPairFormatConfig {
 	return c.Currency.CurrencyPairFormat

config/config_test.go

@@ -1052,59 +1052,6 @@ func TestCountEnabledExchanges(t *testing.T) {
 	}
 }
 
-func TestGetConfigCurrencyPairFormat(t *testing.T) {
-	cfg := GetConfig()
-	err := cfg.LoadConfig(TestFile, true)
-	if err != nil {
-		t.Errorf(
-			"TestGetConfigCurrencyPairFormat. LoadConfig Error: %s", err.Error(),
-		)
-	}
-	_, err = cfg.GetConfigCurrencyPairFormat("asdasdasd")
-	if err == nil {
-		t.Errorf(
-			"TestGetRequestCurrencyPairFormat. Non-existent exchange returned nil error",
-		)
-	}
-
-	exchFmt, err := cfg.GetConfigCurrencyPairFormat("Yobit")
-	if err != nil {
-		t.Errorf("TestGetConfigCurrencyPairFormat err: %s", err)
-	}
-	if !exchFmt.Uppercase || exchFmt.Delimiter != "_" {
-		t.Errorf(
-			"TestGetConfigCurrencyPairFormat. Invalid values",
-		)
-	}
-}
-
-func TestGetRequestCurrencyPairFormat(t *testing.T) {
-	cfg := GetConfig()
-	err := cfg.LoadConfig(TestFile, true)
-	if err != nil {
-		t.Errorf(
-			"TestGetRequestCurrencyPairFormat. LoadConfig Error: %s", err.Error(),
-		)
-	}
-
-	_, err = cfg.GetRequestCurrencyPairFormat("asdasdasd")
-	if err == nil {
-		t.Errorf(
-			"TestGetRequestCurrencyPairFormat. Non-existent exchange returned nil error",
-		)
-	}
-
-	exchFmt, err := cfg.GetRequestCurrencyPairFormat("Yobit")
-	if err != nil {
-		t.Errorf("TestGetRequestCurrencyPairFormat. Err: %s", err)
-	}
-	if exchFmt.Uppercase || exchFmt.Delimiter != "_" || exchFmt.Separator != "-" {
-		t.Errorf(
-			"TestGetRequestCurrencyPairFormat. Invalid values",
-		)
-	}
-}
-
 func TestGetCurrencyPairDisplayConfig(t *testing.T) {
 	cfg := GetConfig()
 	err := cfg.LoadConfig(TestFile, true)
@@ -1929,3 +1876,10 @@ func TestCheckCurrencyConfigValues(t *testing.T) {
 		t.Error("Failed to set CryptocurrencyProvider.APIkey and AccountPlan")
 	}
 }
+
+func TestPreengineConfigUpgrade(t *testing.T) {
+	var c Config
+	if err := c.LoadConfig("../testdata/preengine_config.json", false); err != nil {
+		t.Fatal(err)
+	}
+}

engine/syncer.go

@@ -371,8 +371,8 @@ func (e *ExchangeCurrencyPairSyncer) worker() {
 										c.Ticker.IsUsingWebsocket = false
 										c.Ticker.IsUsingREST = true
 										log.Warnf(log.SyncMgr,
-											"%s %s: No ticker update after 10 seconds, switching from websocket to rest\n",
-											c.Exchange, FormatCurrency(enabledPairs[i]).String())
+											"%s %s: No ticker update after %s, switching from websocket to rest\n",
+											c.Exchange, FormatCurrency(enabledPairs[i]).String(), e.Cfg.SyncTimeout)
 										switchedToRest = true
 										e.setProcessing(c.Exchange, c.Pair, c.AssetType, SyncItemTicker, false)
 									}
@@ -435,8 +435,8 @@ func (e *ExchangeCurrencyPairSyncer) worker() {
 										c.Orderbook.IsUsingWebsocket = false
 										c.Orderbook.IsUsingREST = true
 										log.Warnf(log.SyncMgr,
-											"%s %s: No orderbook update after 15 seconds, switching from websocket to rest\n",
-											c.Exchange, FormatCurrency(c.Pair).String())
+											"%s %s: No orderbook update after %s, switching from websocket to rest\n",
+											c.Exchange, FormatCurrency(c.Pair).String(), e.Cfg.SyncTimeout)
 										switchedToRest = true
 										e.setProcessing(c.Exchange, c.Pair, c.AssetType, SyncItemOrderbook, false)
 									}

main.go

@@ -30,7 +30,7 @@ func main() {
 	flag.BoolVar(&settings.EnableAllPairs, "enableallpairs", false, "enables all pairs for enabled exchanges")
 	flag.BoolVar(&settings.EnablePortfolioManager, "portfoliomanager", true, "enables the portfolio manager")
 	flag.BoolVar(&settings.EnableGRPC, "grpc", true, "enables the grpc server")
-	flag.BoolVar(&settings.EnableGRPCProxy, "grpcproxy", true, "enables the grpc proxy server")
+	flag.BoolVar(&settings.EnableGRPCProxy, "grpcproxy", false, "enables the grpc proxy server")
 	flag.BoolVar(&settings.EnableWebsocketRPC, "websocketrpc", true, "enables the websocket RPC server")
 	flag.BoolVar(&settings.EnableDeprecatedRPC, "deprecatedrpc", true, "enables the deprecated RPC server")
 	flag.BoolVar(&settings.EnableCommsRelayer, "enablecommsrelayer", true, "enables available communications relayer")