Remove connsCount from Client, connsCount -> connCount for `S…

…erver`
skycoin · Jun 15, 2019 · e881d7f · e881d7f
1 parent 5f7a9ea
commit e881d7f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/pkg/dmsg/client.go b/pkg/dmsg/client.go
@@ -319,13 +319,6 @@ func (c *Client) updateDiscEntry(ctx context.Context) error {
 	return c.dc.UpdateEntry(ctx, c.sk, entry)
 }
 
-func (c *Client) connsCount() int {
-	c.mx.RLock()
-	count := len(c.conns)
-	c.mx.RUnlock()
-	return count
-}
-
 func (c *Client) setConn(ctx context.Context, l *ClientConn) {
 	c.mx.Lock()
 	c.conns[l.remoteSrv] = l

diff --git a/pkg/dmsg/server.go b/pkg/dmsg/server.go
@@ -269,11 +269,11 @@ func (s *Server) getConn(pk cipher.PubKey) (*ServerConn, bool) {
 	return l, ok
 }
 
-func (s *Server) connsCount() int {
+func (s *Server) connCount() int {
 	s.mx.RLock()
-	count := len(s.conns)
+	n := len(s.conns)
 	s.mx.RUnlock()
-	return count
+	return n
 }
 
 // Close closes the dms_server.

diff --git a/pkg/dmsg/server_test.go b/pkg/dmsg/server_test.go
@@ -208,7 +208,7 @@ func TestServer_Serve(t *testing.T) {
 		require.NoError(t, aErr)
 
 		// must be 2 ServerConn's
-		require.Equal(t, 2, s.connsCount())
+		require.Equal(t, 2, s.connCount())
 
 		// must have ServerConn for A
 		aServerConn, ok := s.getConn(aPK)
@@ -253,7 +253,7 @@ func TestServer_Serve(t *testing.T) {
 		require.NoError(t, err)
 
 		require.NoError(t, testWithTimeout(5*time.Second, func() error {
-			if s.connsCount() != 0 {
+			if s.connCount() != 0 {
 				return errors.New("s.conns is not empty")
 			}
 
@@ -404,7 +404,7 @@ func TestServer_Serve(t *testing.T) {
 		require.NoError(t, err)
 
 		// check ServerConn's count
-		require.Equal(t, len(usedRemotes)+initiatorsCount, s.connsCount())
+		require.Equal(t, len(usedRemotes)+initiatorsCount, s.connCount())
 
 		for i, initiator := range initiators {
 			// get and check initiator's ServerConn
@@ -478,7 +478,7 @@ func TestServer_Serve(t *testing.T) {
 		}
 
 		require.NoError(t, testWithTimeout(10*time.Second, func() error {
-			if s.connsCount() != 0 {
+			if s.connCount() != 0 {
 				return errors.New("s.conns is not empty")
 			}