config.LoadConfig is redundant.

Buhrietoe · Jan 9, 2017 · 6215ac5 · 6215ac5
1 parent 82d4fa6
commit 6215ac5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/main.go b/main.go
@@ -55,7 +55,7 @@ func main() {
 		// Load config
 		configFile := args["--config"].(string)
 
-		config := config.LoadConfig(configFile)
+		config := config.Load(configFile)
 
 		// Build and run web server
 		serv := server.BuildServer()

diff --git a/server/config/config.go b/server/config/config.go
@@ -16,8 +16,8 @@ type BroodConfig struct {
 	Auth   auth.Auth     // Auth config
 }
 
-// LoadConfig retrieves data needed to start the server
-func LoadConfig(configFile string) (config BroodConfig) {
+// Load retrieves data needed to start the server
+func Load(configFile string) (config BroodConfig) {
 	viper.SetEnvPrefix("brood")
 	viper.SetConfigType("toml")
 	viper.SetConfigName("brood")

diff --git a/server/config/config_test.go b/server/config/config_test.go
@@ -5,11 +5,11 @@ import (
 	"testing"
 )
 
-func TestLoadConfig(t *testing.T) {
+func TestLoad(t *testing.T) {
 	os.Setenv("BROOD_SERVER_ADDRESS", "127.0.0.1")
 	os.Setenv("BROOD_SERVER_PORT", "1111")
 
-	testConfig := LoadConfig("")
+	testConfig := Load("")
 
 	if testConfig.Server.ListenString != "127.0.0.1:1111" {
 		t.Errorf("Server ListenString expected '127.0.0.1:1111', got %v\n", testConfig.Server.ListenString)