Merge pull request checksum0#1 from triple-a/hotfix/data-race

Hotfix/data race

electrum/network.go

@@ -177,9 +177,7 @@ func NewClientSSL(
 		return nil, err
 	}
 
-	// c.transportLock.Lock()
 	c.transport = transport
-	// c.transportLock.Unlock()
 	go c.listen()
 
 	return c, nil
@@ -213,6 +211,7 @@ func (s *Client) listen() {
 			return
 		case err := <-s.transport.Errors():
 			s.Error <- err
+			s.transport = nil
 			s.Shutdown()
 		case bytes := <-s.transport.Responses():
 			result := &container{
@@ -341,16 +340,15 @@ func (s *Client) Shutdown() {
 	if !s.IsShutdown() {
 		close(s.quit)
 	}
-
 	if s.transport != nil {
 		_ = s.transport.Close()
 	}
-	s.transport = nil
-	s.handlers = nil
-	s.pushHandlers = nil
 	if (s.txCache) != nil {
 		s.txCache.Close()
 	}
+	// s.transport = nil
+	s.handlers = nil
+	s.pushHandlers = nil
 }
 
 func (s *Client) IsShutdown() bool {

electrum/transport.go

@@ -14,7 +14,6 @@ type TCPTransport struct {
 	conn      net.Conn
 	responses chan []byte
 	errors    chan error
-	isClosed  bool
 }
 
 // DialerOption is a function that configures a TCPTransport.
@@ -101,9 +100,6 @@ func (t *TCPTransport) listen() {
 			t.errors <- err
 			break
 		}
-		if t.isClosed {
-			break
-		}
 		if DebugMode {
 			log.Printf(
 				"%s [debug] %s -> %s",
@@ -143,6 +139,5 @@ func (t *TCPTransport) Errors() <-chan error {
 }
 
 func (t *TCPTransport) Close() error {
-	t.isClosed = true
 	return t.conn.Close()
 }