From a459d37f81264fca455fffb516145d7e3d39395a Mon Sep 17 00:00:00 2001
From: Adrian Gallagher <thrasher@addictionsoftware.com>
Date: Wed, 29 Mar 2017 08:16:11 +1100
Subject: [PATCH] Package events and smsglobal

---
 events.go => events/events.go          |  2 +-
 main.go                                |  3 ++-
 smsglobal.go => smsglobal/smsglobal.go | 25 +++++++++++++------------
 3 files changed, 16 insertions(+), 14 deletions(-)
 rename events.go => events/events.go (99%)
 rename smsglobal.go => smsglobal/smsglobal.go (62%)

diff --git a/events.go b/events/events.go
similarity index 99%
rename from events.go
rename to events/events.go
index 4fb96593..db46b2fc 100644
--- a/events.go
+++ b/events/events.go
@@ -1,4 +1,4 @@
-package main
+package events
 
 import (
 	"errors"
diff --git a/main.go b/main.go
index e319d06e..35100ad0 100644
--- a/main.go
+++ b/main.go
@@ -30,6 +30,7 @@ import (
 	"github.com/thrasher-/gocryptotrader/exchanges/okcoin"
 	"github.com/thrasher-/gocryptotrader/exchanges/poloniex"
 	"github.com/thrasher-/gocryptotrader/exchanges/ticker"
+	"github.com/thrasher-/gocryptotrader/smsglobal"
 )
 
 type ExchangeMain struct {
@@ -98,7 +99,7 @@ func main() {
 			log.Println(err) // non fatal event
 			bot.config.SMS.Enabled = false
 		} else {
-			log.Printf("SMS support enabled. Number of SMS contacts %d.\n", GetEnabledSMSContacts())
+			log.Printf("SMS support enabled. Number of SMS contacts %d.\n", smsglobal.GetEnabledSMSContacts(bot.config.SMS))
 		}
 	} else {
 		log.Println("SMS support disabled.")
diff --git a/smsglobal.go b/smsglobal/smsglobal.go
similarity index 62%
rename from smsglobal.go
rename to smsglobal/smsglobal.go
index 48280c9e..8084d21e 100644
--- a/smsglobal.go
+++ b/smsglobal/smsglobal.go
@@ -1,4 +1,4 @@
-package main
+package smsglobal
 
 import (
 	"errors"
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/thrasher-/gocryptotrader/common"
+	"github.com/thrasher-/gocryptotrader/config"
 )
 
 const (
@@ -15,9 +16,9 @@ const (
 	ErrSMSNotSent         = "SMS message not sent."
 )
 
-func GetEnabledSMSContacts() int {
+func GetEnabledSMSContacts(smsCfg config.SMSGlobalConfig) int {
 	counter := 0
-	for _, contact := range bot.config.SMS.Contacts {
+	for _, contact := range smsCfg.Contacts {
 		if contact.Enabled {
 			counter++
 		}
@@ -25,10 +26,10 @@ func GetEnabledSMSContacts() int {
 	return counter
 }
 
-func SMSSendToAll(message string) {
-	for _, contact := range bot.config.SMS.Contacts {
+func SMSSendToAll(message string, cfg config.Config) {
+	for _, contact := range cfg.SMS.Contacts {
 		if contact.Enabled {
-			err := SMSNotify(contact.Number, message)
+			err := SMSNotify(contact.Number, message, cfg)
 			if err != nil {
 				log.Printf("Unable to send SMS to %s.\n", contact.Name)
 			}
@@ -36,8 +37,8 @@ func SMSSendToAll(message string) {
 	}
 }
 
-func SMSGetNumberByName(name string) string {
-	for _, contact := range bot.config.SMS.Contacts {
+func SMSGetNumberByName(name string, smsCfg config.SMSGlobalConfig) string {
+	for _, contact := range smsCfg.Contacts {
 		if contact.Name == name {
 			return contact.Number
 		}
@@ -45,12 +46,12 @@ func SMSGetNumberByName(name string) string {
 	return ErrSMSContactNotFound
 }
 
-func SMSNotify(to, message string) error {
+func SMSNotify(to, message string, cfg config.Config) error {
 	values := url.Values{}
 	values.Set("action", "sendsms")
-	values.Set("user", bot.config.SMS.Username)
-	values.Set("password", bot.config.SMS.Password)
-	values.Set("from", bot.config.Name)
+	values.Set("user", cfg.SMS.Username)
+	values.Set("password", cfg.SMS.Password)
+	values.Set("from", cfg.Name)
 	values.Set("to", to)
 	values.Set("text", message)