Remove lbrynet servers from config module
@@ -7,7 +7,6 @@ import (
"github.com/lbryio/lbrytv/models"
- "github.com/sirupsen/logrus"
"github.com/spf13/viper"
)
@@ -132,16 +131,6 @@ func GetAddress() string {
//GetLbrynetServers returns the names/addresses of every SDK server
func GetLbrynetServers() map[string]string {
- if Config.Viper.GetString(deprecatedLbrynet) != "" &&
- len(Config.Viper.GetStringMapString(lbrynetServers)) > 0 {
- logrus.Panicf("Both %s and %s are set. This is a highlander situation...there can be only 1.", deprecatedLbrynet, lbrynetServers)
- }
-
- if len(Config.Viper.GetStringMapString(lbrynetServers)) > 0 {
- return Config.Viper.GetStringMapString(lbrynetServers)
- } else if Config.Viper.GetString(deprecatedLbrynet) != "" {
- return map[string]string{"sdk": Config.Viper.GetString(deprecatedLbrynet)}
- } else {
servers, err := models.LbrynetServers().AllG()
if err != nil {
panic("Could not retrieve lbrynet server list from db and config is not set.")
@@ -151,7 +140,6 @@ func GetLbrynetServers() map[string]string {
}
return nil
}
-}
// GetInternalAPIHost returns the address of internal-api server
func GetInternalAPIHost() string {
