Cleaned up linter issues.

This is a breaking change!  IRCConfig is part of IRCClient.
IRCClient can't be serialized.  IRCConfig can be.

client_test.go

@@ -38,8 +38,7 @@ func TestMarshal(t *testing.T) {
 		t.Error("json.Unmarshal:", err)
 	}
 
-	var fields []reflect.StructField
-	fields = reflect.VisibleFields(reflect.TypeOf(config))
+	var fields []reflect.StructField = reflect.VisibleFields(reflect.TypeOf(config))
 	var config_value reflect.Value = reflect.ValueOf(config)
 	var verify_value reflect.Value = reflect.ValueOf(verify)
 
@@ -183,12 +182,14 @@ func TestConnect(t *testing.T) {
 
 	config.Hostname = parts[0]
 	config.Port, _ = strconv.Atoi(parts[1])
-	go ircServer(listen, t, &config)
+	var irc IRCClient = IRCClient{IRCConfig: config}
+	go ircServer(listen, t, &irc)
 	var FromIRC chan IRCMsg = make(chan IRCMsg)
-	config.ReadChannel = FromIRC
 
-	config.Connect()
-	defer config.Close()
+	irc.ReadChannel = FromIRC
+
+	irc.Connect()
+	defer irc.Close()
 
 	var Msg IRCMsg
 	var motd, identify, support bool
@@ -216,7 +217,7 @@ func TestConnect(t *testing.T) {
 			for key, value := range isupport {
 				var got string
 				var has bool
-				got, has = config.ISupport[key]
+				got, has = irc.ISupport[key]
 				if !has {
 					t.Errorf("Missing ISUPPORT[%s] expected (%s)", key, value)
 					support = false
@@ -245,8 +246,8 @@ func TestConnect(t *testing.T) {
 	if !support {
 		t.Error("Missing ISupport")
 	}
-	if config.MyNick != config.Nick {
-		t.Errorf("Got %s, Expected %s", config.MyNick, config.Nick)
+	if irc.MyNick != config.Nick {
+		t.Errorf("Got %s, Expected %s", irc.MyNick, config.Nick)
 	}
 
 }
@@ -266,12 +267,13 @@ func TestConnectNickInUse(t *testing.T) {
 
 	config.Hostname = parts[0]
 	config.Port, _ = strconv.Atoi(parts[1])
-	go ircServer(listen, t, &config)
+	var irc IRCClient = IRCClient{IRCConfig: config}
+	go ircServer(listen, t, &irc)
 	var FromIRC chan IRCMsg = make(chan IRCMsg)
-	config.ReadChannel = FromIRC
+	irc.ReadChannel = FromIRC
 
-	config.Connect()
-	defer config.Close()
+	irc.Connect()
+	defer irc.Close()
 
 	var Msg IRCMsg
 	var motd, identify bool
@@ -281,10 +283,10 @@ func TestConnectNickInUse(t *testing.T) {
 		if Msg.Cmd == "EndMOTD" {
 			t.Log("Got EndMOTD")
 			motd = true
-			config.WriteTo("missing", "PRIVMSG missing :Missing user")
-			config.WriteTo("missing", "PRIVMSG missing :Missing user")
-			config.WriteTo("missing", "PRIVMSG missing :Missing user")
-			config.WriteTo("#missing", "PRIVMSG #missing :Missing channel")
+			irc.WriteTo("missing", "PRIVMSG missing :Missing user")
+			irc.WriteTo("missing", "PRIVMSG missing :Missing user")
+			irc.WriteTo("missing", "PRIVMSG missing :Missing user")
+			irc.WriteTo("#missing", "PRIVMSG #missing :Missing channel")
 		}
 		if Msg.Cmd == "Identified" {
 			t.Log("Identified")
@@ -304,8 +306,8 @@ func TestConnectNickInUse(t *testing.T) {
 	if missing < 2 {
 		t.Errorf("Missing should have been 2, was %d", missing)
 	}
-	if config.MyNick == config.Nick {
-		t.Errorf("Nick should be different: Got %s, Didn't Expect %s", config.MyNick, config.Nick)
+	if irc.MyNick == config.Nick {
+		t.Errorf("Nick should be different: Got %s, Didn't Expect %s", irc.MyNick, config.Nick)
 	}
 }
 func TestConnectTLS(t *testing.T) {
@@ -325,12 +327,13 @@ func TestConnectTLS(t *testing.T) {
 
 	config.Hostname = parts[0]
 	config.Port, _ = strconv.Atoi(parts[1])
-	go ircServer(listen, t, &config)
+	var irc IRCClient = IRCClient{IRCConfig: config}
+	go ircServer(listen, t, &irc)
 	var FromIRC chan IRCMsg = make(chan IRCMsg)
-	config.ReadChannel = FromIRC
+	irc.ReadChannel = FromIRC
 
-	config.Connect()
-	defer config.Close()
+	irc.Connect()
+	defer irc.Close()
 
 	var Msg IRCMsg
 	var motd, identify bool
@@ -352,8 +355,8 @@ func TestConnectTLS(t *testing.T) {
 		t.Error("Missing Identified")
 	}
 
-	if config.MyNick != config.Nick {
-		t.Errorf("Got %s, Expected %s", config.MyNick, config.Nick)
+	if irc.MyNick != config.Nick {
+		t.Errorf("Got %s, Expected %s", irc.MyNick, config.Nick)
 	}
 
 }
@@ -379,12 +382,13 @@ func TestConnectAutojoin(t *testing.T) {
 
 	config.Hostname = parts[0]
 	config.Port, _ = strconv.Atoi(parts[1])
-	go ircServer(listen, t, &config)
+	var irc IRCClient = IRCClient{IRCConfig: config}
+	go ircServer(listen, t, &irc)
 	var FromIRC chan IRCMsg = make(chan IRCMsg)
-	config.ReadChannel = FromIRC
+	irc.ReadChannel = FromIRC
 
-	config.Connect()
-	defer config.Close()
+	irc.Connect()
+	defer irc.Close()
 
 	var Msg IRCMsg
 	var motd, identify bool
@@ -418,14 +422,14 @@ func TestConnectAutojoin(t *testing.T) {
 			joins++
 			if joins == 2 {
 				// messages set to echo are returned to us
-				config.WriteTo("echo", "PRIVMSG echo :\x01VERSION\x01")
-				config.WriteTo("echo", "PRIVMSG echo :\x01TIME\x01")
-				config.WriteTo("echo", "PRIVMSG echo :\x01PING 12345\x01")
-				config.Action("echo", "dances.")
-				config.Notice("echo", "Testing")
-				config.Msg("#test", "Message 1")
-				config.Msg("#test", "Message 2")
-				config.PriorityWrite("PRIVMSG #test :Message")
+				irc.WriteTo("echo", "PRIVMSG echo :\x01VERSION\x01")
+				irc.WriteTo("echo", "PRIVMSG echo :\x01TIME\x01")
+				irc.WriteTo("echo", "PRIVMSG echo :\x01PING 12345\x01")
+				irc.Action("echo", "dances.")
+				irc.Notice("echo", "Testing")
+				irc.Msg("#test", "Message 1")
+				irc.Msg("#test", "Message 2")
+				irc.PriorityWrite("PRIVMSG #test :Message")
 			}
 		}
 		if Msg.Cmd == "CTCP" {
@@ -469,8 +473,8 @@ func TestConnectAutojoin(t *testing.T) {
 		t.Errorf("Expected more CTCPs (%d)", len(ctcpExpect))
 	}
 
-	if config.MyNick != config.Nick {
-		t.Errorf("Got %s, Expected %s", config.MyNick, config.Nick)
+	if irc.MyNick != config.Nick {
+		t.Errorf("Got %s, Expected %s", irc.MyNick, config.Nick)
 	}
 
 }
@@ -501,13 +505,14 @@ func TestConnectKick(t *testing.T) {
 	var abortPrev = abortAfter
 	defer func() { abortAfter = abortPrev }()
 	abortAfter = 500
-	go ircServer(listen, t, &config)
+	var irc IRCClient = IRCClient{IRCConfig: config}
+	go ircServer(listen, t, &irc)
 
 	var FromIRC chan IRCMsg = make(chan IRCMsg)
-	config.ReadChannel = FromIRC
+	irc.ReadChannel = FromIRC
 
-	config.Connect()
-	defer config.Close()
+	irc.Connect()
+	defer irc.Close()
 
 	var Msg IRCMsg
 	var motd, identify bool
@@ -525,7 +530,7 @@ func TestConnectKick(t *testing.T) {
 		if Msg.Cmd == "JOIN" {
 			joins++
 			if joins == 4 {
-				config.PriorityWrite("NICK something")
+				irc.PriorityWrite("NICK something")
 			}
 		}
 	}
@@ -540,8 +545,8 @@ func TestConnectKick(t *testing.T) {
 	if !identify {
 		t.Error("Missing Identified")
 	}
-	if config.MyNick != "something" {
-		t.Errorf("Expected nick to be something, not %s", config.MyNick)
+	if irc.MyNick != "something" {
+		t.Errorf("Expected nick to be something, not %s", irc.MyNick)
 	}
 }
 
@@ -560,21 +565,24 @@ func TestConnectSignal(t *testing.T) {
 		AutoJoin:    []string{"#chat"},
 		Flood_Num:   2,
 		Flood_Delay: 10,
-		OnExit:      onexit,
 	}
+	var irc IRCClient = IRCClient{IRCConfig: config,
+		OnExit: onexit,
+	}
+
 	var listen net.Listener
 	var address string
 
 	listen, address = setupTLSSocket()
 	var parts []string = strings.Split(address, ":")
 
-	config.Hostname = parts[0]
-	config.Port, _ = strconv.Atoi(parts[1])
-	go ircServer(listen, t, &config)
+	irc.Hostname = parts[0]
+	irc.Port, _ = strconv.Atoi(parts[1])
+	go ircServer(listen, t, &irc)
 	var FromIRC chan IRCMsg = make(chan IRCMsg)
-	config.ReadChannel = FromIRC
+	irc.ReadChannel = FromIRC
 
-	config.Connect()
+	irc.Connect()
 	// defer config.Close()
 
 	var Msg IRCMsg
@@ -604,7 +612,7 @@ func TestConnectSignal(t *testing.T) {
 		t.Error("Missing Identified")
 	}
 
-	config.Close()
+	irc.Close()
 
 	if !exit {
 		t.Error("AtExit wasn't called.")

irc-client.go

@@ -146,54 +146,58 @@ type IRCWrite struct {
 }
 
 type IRCConfig struct {
-	Port           int               `json:"Port"`
-	Hostname       string            `json:"Hostname"`
-	UseTLS         bool              `json:"UseTLS"`   // Use TLS Secure connection
-	UseSASL        bool              `json:"UseSASL"`  // Authenticate via SASL
-	Insecure       bool              `json:"Insecure"` // Allow self-signed certificates
-	Nick           string            `json:"Nick"`
-	Username       string            `json:"Username"`
-	Realname       string            `json:"Realname"`
-	Password       string            `json:"Password"`       // Password for nickserv
-	ServerPassword string            `json:"ServerPassword"` // Password for server
-	AutoJoin       []string          `json:"AutoJoin"`       // Channels to auto-join
-	RejoinDelay    int               `json:"RejoinDelay"`    // ms to rejoin
-	Version        string            `json:"Version"`        // Version displayed
-	Flood_Num      int               `json:"FloodNum"`       // Number of lines sent before considered a flood
-	Flood_Time     int               `json:"FloodTime"`      // Number of Seconds to track previous messages
-	Flood_Delay    int               `json:"FloodDelay"`     // Delay between sending when flood protection on (Milliseconds)
-	Debug_Output   bool              `json:"Debug"`
-	MyNick         string            `json:"-"` // Client's current nick
-	OnExit         func()            `json:"-"` // Called on exit
-	Socket         net.Conn          `json:"-"`
-	Reader         *bufio.Reader     `json:"-"`
-	ReadChannel    chan IRCMsg       `json:"-"`
-	ReadEvents     []string          `json:"-"`
-	WriteChannel   chan IRCWrite     `json:"-"`
-	DelChannel     chan string       `json:"-"` // For deleting channel or nicks that are missing.
-	Registered     bool              `json:"-"`
-	ISupport       map[string]string `json:"-"` // 005
-	wg             sync.WaitGroup    `json:"-"`
-	Mutex          sync.Mutex        `json:"-"`
+	Port           int      `json:"Port"`
+	Hostname       string   `json:"Hostname"`
+	UseTLS         bool     `json:"UseTLS"`   // Use TLS Secure connection
+	UseSASL        bool     `json:"UseSASL"`  // Authenticate via SASL
+	Insecure       bool     `json:"Insecure"` // Allow self-signed certificates
+	Nick           string   `json:"Nick"`
+	Username       string   `json:"Username"`
+	Realname       string   `json:"Realname"`
+	Password       string   `json:"Password"`       // Password for nickserv
+	ServerPassword string   `json:"ServerPassword"` // Password for server
+	AutoJoin       []string `json:"AutoJoin"`       // Channels to auto-join
+	RejoinDelay    int      `json:"RejoinDelay"`    // ms to rejoin
+	Version        string   `json:"Version"`        // Version displayed
+	Flood_Num      int      `json:"FloodNum"`       // Number of lines sent before considered a flood
+	Flood_Time     int      `json:"FloodTime"`      // Number of Seconds to track previous messages
+	Flood_Delay    int      `json:"FloodDelay"`     // Delay between sending when flood protection on (Milliseconds)
+	Debug_Output   bool     `json:"Debug"`
 }
 
-func (Config *IRCConfig) GetNick() string {
+type IRCClient struct {
+	IRCConfig
+	MyNick       string // Client's current nick
+	OnExit       func() // Called on exit
+	Socket       net.Conn
+	Reader       *bufio.Reader
+	ReadChannel  chan IRCMsg
+	ReadEvents   []string
+	WriteChannel chan IRCWrite
+	DelChannel   chan string // For deleting channel or nicks that are missing.
+	Registered   bool
+	ISupport     map[string]string // 005
+	wg           sync.WaitGroup
+	Mutex        sync.Mutex
+}
+
+func (Config *IRCClient) GetNick() string {
 	Config.Mutex.Lock()
 	defer Config.Mutex.Unlock()
 	return Config.MyNick
 }
 
-func (Config *IRCConfig) SetNick(nick string) {
+func (Config *IRCClient) SetNick(nick string) {
 	Config.Mutex.Lock()
 	defer Config.Mutex.Unlock()
 	Config.MyNick = nick
 }
 
-func (Config *IRCConfig) IsAuto(ch string) bool {
+func (Config *IRCClient) IsAuto(ch string) bool {
 	return StrInArray(Config.AutoJoin, ch)
 }
 
-func (Config *IRCConfig) Connect() bool {
+func (Config *IRCClient) Connect() bool {
 	var err error
 
 	// Set sensible defaults (if not provided),
@@ -274,7 +278,7 @@ func (Config *IRCConfig) Connect() bool {
 }
 
 // Low level write to [TLS]Socket routine.
-func (Config *IRCConfig) write(output string) error {
+func (Config *IRCClient) write(output string) error {
 	var err error
 	if Config.Debug_Output {
 		log.Println(">>", output)
@@ -285,7 +289,7 @@ func (Config *IRCConfig) write(output string) error {
 	return err
 }
 
-func (Config *IRCConfig) WriterRoutine() {
+func (Config *IRCClient) WriterRoutine() {
 	var err error
 	var throttle ThrottleBuffer
 	var Flood FloodTrack
@@ -382,7 +386,7 @@ func (Config *IRCConfig) WriterRoutine() {
 	}
 }
 
-func (Config *IRCConfig) Close() {
+func (Config *IRCClient) Close() {
 	Config.Socket.Close()
 	Config.PriorityWrite("")
 	if Config.OnExit != nil {
@@ -398,31 +402,31 @@ func RandomNick(nick string) string {
 }
 
 // PriorityWrite: Send output command to server immediately.
-func (Config *IRCConfig) PriorityWrite(output string) {
+func (Config *IRCClient) PriorityWrite(output string) {
 	Config.WriteChannel <- IRCWrite{To: "", Output: output}
 }
 
 // WriteTo: Send throttled output command using "to" to throttle.
-func (Config *IRCConfig) WriteTo(to string, output string) {
+func (Config *IRCClient) WriteTo(to string, output string) {
 	Config.WriteChannel <- IRCWrite{To: to, Output: output}
 }
 
 // Msg: Send PRIVMSG, uses WriteTo to throttle.
-func (Config *IRCConfig) Msg(to string, message string) {
+func (Config *IRCClient) Msg(to string, message string) {
 	Config.WriteTo(to, fmt.Sprintf("PRIVMSG %s :%s", to, message))
 }
 
 // Notice: Send NOTICE, uses WriteTo to throttle.
-func (Config *IRCConfig) Notice(to string, message string) {
+func (Config *IRCClient) Notice(to string, message string) {
 	Config.WriteTo(to, fmt.Sprintf("NOTICE %s :%s", to, message))
 }
 
 // Action: Send PRIVMSG CTCP ACTION, uses WriteTo to throttle.
-func (Config *IRCConfig) Action(to string, message string) {
+func (Config *IRCClient) Action(to string, message string) {
 	Config.WriteTo(to, fmt.Sprintf("PRIVMSG %s :\x01ACTION %s\x01", to, message))
 }
 
-func (Config *IRCConfig) ReaderRoutine() {
+func (Config *IRCClient) ReaderRoutine() {
 	defer Config.wg.Done()
 	var registering bool
 

ircd_test.go

@@ -108,7 +108,10 @@ func setupSocket() (listen net.Listener, addr string) {
 
 func ircWrite(server net.Conn, output string, t *testing.T) {
 	t.Logf(">> %s\n", output)
-	server.Write([]byte(output + "\r\n"))
+	_, err := server.Write([]byte(output + "\r\n"))
+	if err != nil {
+		t.Error("server.Write:", err)
+	}
 }
 
 var abortAfter int = 150 // Milliseconds to abort part 3
@@ -128,7 +131,7 @@ var abortAfter int = 150 // Milliseconds to abort part 3
 	Any messages to missing/#missing are returned 404/401.
 	After abortAfter milliseconds, we close the connection.
 */
-func ircServer(listener net.Listener, t *testing.T, config *IRCConfig) {
+func ircServer(listener net.Listener, t *testing.T, config *IRCClient) {
 	var server net.Conn
 	var err error