Omit unnecessary else statements when if does not flow into the nex…

…t statement (thrasher-corp#293)

* Removing unnecessary else

* Fix go fmt issues

codelingo.yaml

@@ -5,6 +5,7 @@ tenets:
   - import: codelingo/effective-go/good-package-name
   - import: codelingo/effective-go/single-method-interface-name
   - import: codelingo/effective-go/underscores-in-name
+  - import: codelingo/effective-go/unnecessary-else
 
   # Overwrite one tenet with custom logic
   # - import: codelingo/effective-go/comment-first-word-when-empty

config/config.go

@@ -1217,20 +1217,19 @@ func GetFilePath(file string) (string, error) {
 		_, err := os.Stat(oldDirs[x])
 		if os.IsNotExist(err) {
 			continue
+		}
+		if filepath.Ext(oldDirs[x]) == ".json" {
+			err = os.Rename(oldDirs[x], newDirs[0])
+			if err != nil {
+				return "", err
+			}
+			log.Debugf("Renamed old config file %s to %s", oldDirs[x], newDirs[0])
 		} else {
-			if filepath.Ext(oldDirs[x]) == ".json" {
-				err = os.Rename(oldDirs[x], newDirs[0])
-				if err != nil {
-					return "", err
-				}
-				log.Debugf("Renamed old config file %s to %s", oldDirs[x], newDirs[0])
-			} else {
-				err = os.Rename(oldDirs[x], newDirs[1])
-				if err != nil {
-					return "", err
-				}
-				log.Debugf("Renamed old config file %s to %s", oldDirs[x], newDirs[1])
+			err = os.Rename(oldDirs[x], newDirs[1])
+			if err != nil {
+				return "", err
 			}
+			log.Debugf("Renamed old config file %s to %s", oldDirs[x], newDirs[1])
 		}
 	}
 

config/config_encryption.go

@@ -81,10 +81,8 @@ func PromptForConfigKey(initialSetup bool) ([]byte, error) {
 		if bytes.Equal(p1, p2) {
 			cryptoKey = p1
 			break
-		} else {
-			log.Printf("Passwords did not match, please try again.")
-			continue
 		}
+		log.Printf("Passwords did not match, please try again.")
 	}
 	return cryptoKey, nil
 }

exchange.go

@@ -244,12 +244,11 @@ func SetupExchanges() {
 		if !exch.Enabled {
 			log.Debugf("%s: Exchange support: Disabled", exch.Name)
 			continue
-		} else {
-			err := LoadExchange(exch.Name, true, &wg)
-			if err != nil {
-				log.Errorf("LoadExchange %s failed: %s", exch.Name, err)
-				continue
-			}
+		}
+		err := LoadExchange(exch.Name, true, &wg)
+		if err != nil {
+			log.Errorf("LoadExchange %s failed: %s", exch.Name, err)
+			continue
 		}
 		log.Debugf(
 			"%s: Exchange support: Enabled (Authenticated API support: %s - Verbose mode: %s).\n",

exchanges/bitfinex/bitfinex_test.go

@@ -221,9 +221,8 @@ func TestGetSymbols(t *testing.T) {
 		for _, explicitSymbol := range expectedCurrencies {
 			if common.StringDataCompare(expectedCurrencies, explicitSymbol) {
 				break
-			} else {
-				t.Error("BitfinexGetSymbols currency mismatch with: ", explicitSymbol)
 			}
+			t.Error("BitfinexGetSymbols currency mismatch with: ", explicitSymbol)
 		}
 	} else {
 		t.Error("BitfinexGetSymbols currency mismatch, Expected Currencies < Exchange Currencies")