From b7b224983c59a507fa0dabd753e5b12ca4d75ca7 Mon Sep 17 00:00:00 2001
From: Adhityaa Chandrasekar <adtac@adtac.in>
Date: Tue, 24 Jul 2018 12:11:01 +0530
Subject: [PATCH] config.go: rename parseConfig to configParse

---
 api/config.go      |  2 +-
 api/config_test.go | 26 +++++++++++++-------------
 api/main.go        |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/api/config.go b/api/config.go
index 4b72698..c2f7dc6 100644
--- a/api/config.go
+++ b/api/config.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 )
 
-func parseConfig() error {
+func configParse() error {
 	binPath, err := filepath.Abs(filepath.Dir(os.Args[0]))
 	if err != nil {
 		logger.Errorf("cannot load binary path: %v", err)
diff --git a/api/config_test.go b/api/config_test.go
index a5e00d9..76291bc 100644
--- a/api/config_test.go
+++ b/api/config_test.go
@@ -6,10 +6,10 @@ import (
 	"testing"
 )
 
-func TestParseConfigBasics(t *testing.T) {
+func TestConfigParseBasics(t *testing.T) {
 	os.Setenv("COMMENTO_ORIGIN", "https://commento.io")
 
-	if err := parseConfig(); err != nil {
+	if err := configParse(); err != nil {
 		t.Errorf("unexpected error when parsing config: %v", err)
 		return
 	}
@@ -21,7 +21,7 @@ func TestParseConfigBasics(t *testing.T) {
 
 	os.Setenv("COMMENTO_BIND_ADDRESS", "192.168.1.100")
 
-	if err := parseConfig(); err != nil {
+	if err := configParse(); err != nil {
 		t.Errorf("unexpected error when parsing config: %v", err)
 		return
 	}
@@ -39,7 +39,7 @@ func TestParseConfigBasics(t *testing.T) {
 
 	os.Setenv("COMMENTO_PORT", "1886")
 
-	if err := parseConfig(); err != nil {
+	if err := configParse(); err != nil {
 		t.Errorf("unexpected error when parsing config: %v", err)
 		return
 	}
@@ -50,19 +50,19 @@ func TestParseConfigBasics(t *testing.T) {
 	}
 }
 
-func TestParseConfigNoOrigin(t *testing.T) {
+func TestConfigParseNoOrigin(t *testing.T) {
 	os.Setenv("COMMENTO_ORIGIN", "")
 
-	if err := parseConfig(); err == nil {
+	if err := configParse(); err == nil {
 		t.Errorf("expected error not found parsing config without ORIGIN")
 		return
 	}
 }
 
-func TestParseConfigStatic(t *testing.T) {
+func TestConfigParseStatic(t *testing.T) {
 	os.Setenv("COMMENTO_ORIGIN", "https://commento.io")
 
-	if err := parseConfig(); err != nil {
+	if err := configParse(); err != nil {
 		t.Errorf("unexpected error when parsing config: %v", err)
 		return
 	}
@@ -80,7 +80,7 @@ func TestParseConfigStatic(t *testing.T) {
 
 	os.Setenv("COMMENTO_STATIC", "/usr/")
 
-	if err := parseConfig(); err != nil {
+	if err := configParse(); err != nil {
 		t.Errorf("unexpected error when parsing config: %v", err)
 		return
 	}
@@ -91,21 +91,21 @@ func TestParseConfigStatic(t *testing.T) {
 	}
 }
 
-func TestParseConfigStaticDNE(t *testing.T) {
+func TestConfigParseStaticDNE(t *testing.T) {
 	os.Setenv("COMMENTO_ORIGIN", "https://commento.io")
 	os.Setenv("COMMENTO_STATIC", "/does/not/exist/surely/")
 
-	if err := parseConfig(); err == nil {
+	if err := configParse(); err == nil {
 		t.Errorf("expected error not found when a non-existant directory is used")
 		return
 	}
 }
 
-func TestParseConfigStaticNotADirectory(t *testing.T) {
+func TestConfigParseStaticNotADirectory(t *testing.T) {
 	os.Setenv("COMMENTO_ORIGIN", "https://commento.io")
 	os.Setenv("COMMENTO_STATIC", os.Args[0])
 
-	if err := parseConfig(); err != errorNotADirectory {
+	if err := configParse(); err != errorNotADirectory {
 		t.Errorf("expected error not found when a file is used")
 		return
 	}
diff --git a/api/main.go b/api/main.go
index 08d5008..86185a1 100644
--- a/api/main.go
+++ b/api/main.go
@@ -2,7 +2,7 @@ package main
 
 func main() {
 	exitIfError(createLogger())
-	exitIfError(parseConfig())
+	exitIfError(configParse())
 	exitIfError(connectDB(5))
 	exitIfError(performMigrations())
 	exitIfError(smtpConfigure())