Use ConfirmConfigJSON function

yangdemin · Mar 5, 2017 · 5347ea8 · 5347ea8
1 parent 255bd12
commit 5347ea8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config.go b/config.go
@@ -214,7 +214,7 @@ func ReadConfig() error {
 	}
 
 	if !ConfirmECS(file) {
-		err := json.Unmarshal(file, &bot.config)
+		err = ConfirmConfigJSON(file, &bot.config)
 		if err != nil {
 			return err
 		}
@@ -240,7 +240,7 @@ func ReadConfig() error {
 			return err
 		}
 
-		err = json.Unmarshal(data, &bot.config)
+		err = ConfirmConfigJSON(data, &bot.config)
 		if err != nil {
 			return err
 		}

diff --git a/config_encryption.go b/config_encryption.go
@@ -96,8 +96,8 @@ func DecryptConfigFile(configData, key []byte) ([]byte, error) {
 	return result, nil
 }
 
-func ConfirmWalletJSON(file []byte, result interface{}) error {
-	return JSONDecode(file, result)
+func ConfirmConfigJSON(file []byte, result interface{}) error {
+	return JSONDecode(file, &result)
 }
 
 func ConfirmECS(file []byte) bool {