Set newStatus to enabled if no result are returned from credentials test.

[perso/Immae/Projets/Cryptomonnaies/Cryptoportfolio/Front.git] / api / market_config.go

diff --git a/api/market_config.go b/api/market_config.go
index c7e2e15428b181eb46f48260e852935dea2b0e6b..d5f05d9743df29c178d3eddd325003e3588697a3 100644 (file)
--- a/api/market_config.go
+++ b/api/market_config.go
@@ -80,7 +80,7 @@ func (q TestMarketCredentialsQuery) Run() (interface{}, *Error) {
        }
 
        resultErr := CallExternalService(fmt.Sprintf("'%s' TestCredentials", q.In.Market), EXTERNAL_SERVICE_TIMEOUT_SECONDS*time.Second, func() error {
-               err := Poloniex.TestCredentials(config.Config["key"], config.Config["secret"])
+               err := Poloniex.TestCredentials(config.Config["key"], config.Config["secret"], EXTERNAL_SERVICE_TIMEOUT_SECONDS)
 
                if utils.ErrIs(err, markets.InvalidCredentials) {
                        return &Error{InvalidMarketCredentials, "wrong market credentials", fmt.Errorf("wrong '%v' market credentials", q.In.Market)}
@@ -105,6 +105,8 @@ func (q TestMarketCredentialsQuery) Run() (interface{}, *Error) {
                return nil, NewInternalError(resultErr)
        } else if resultErr != nil {
                return nil, NewInternalError(resultErr)
+       } else if resultErr == nil {
+               newStatus = db.MarketConfigEnabled
        }
 
        if newStatus != config.Status {
@@ -152,7 +154,7 @@ func (q UpdateMarketConfigQuery) Run() (interface{}, *Error) {
        }
 
        resultErr := CallExternalService(fmt.Sprintf("'%s' TestCredentials", q.In.Market), EXTERNAL_SERVICE_TIMEOUT_SECONDS*time.Second, func() error {
-               err := Poloniex.TestCredentials(marketConfig.Config["key"], marketConfig.Config["secret"])
+               err := Poloniex.TestCredentials(marketConfig.Config["key"], marketConfig.Config["secret"], EXTERNAL_SERVICE_TIMEOUT_SECONDS)
 
                if utils.ErrIs(err, markets.InvalidCredentials) {
                        return &Error{InvalidMarketCredentials, "wrong market credentials", fmt.Errorf("wrong '%v' market credentials", q.In.Market)}