Fixes issues where RLock was not unlocked properly

This fixes an issue where RLock was unlocked with an Unlock instead of
and RUnlock causing a panic.

intgtest/connection_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/smartcontractkit/wsrpc"
 	"github.com/smartcontractkit/wsrpc/connectivity"
+	"github.com/smartcontractkit/wsrpc/credentials"
 	pb "github.com/smartcontractkit/wsrpc/intgtest/internal/rpcs"
 )
 
@@ -159,3 +160,73 @@ func Test_InvalidCredentials(t *testing.T) {
 
 	waitForReadyConnection(t, conn)
 }
+
+func Test_GetConnectedPeerPublicKeys(t *testing.T) {
+	keypairs := generateKeys(t)
+	pubKeys := []ed25519.PublicKey{keypairs.Client1.PubKey}
+
+	// Start the server
+	lis, s := setupServer(t,
+		wsrpc.Creds(keypairs.Server.PrivKey, pubKeys),
+	)
+
+	// Register the ping server implementation with the wsrpc server
+	pb.RegisterEchoServer(s, &echoServer{})
+
+	// Start serving
+	go s.Serve(lis)
+	t.Cleanup(s.Stop)
+
+	require.Empty(t, s.GetConnectedPeerPublicKeys())
+
+	// Start client
+	conn, err := setupClientConn(t, 100*time.Millisecond,
+		wsrpc.WithTransportCreds(keypairs.Client1.PrivKey, keypairs.Server.PubKey),
+	)
+	require.NoError(t, err)
+	t.Cleanup(conn.Close)
+
+	waitForReadyConnection(t, conn)
+
+	connectedKeys := s.GetConnectedPeerPublicKeys()
+	require.Len(t, s.GetConnectedPeerPublicKeys(), 1)
+	actualKey, err := credentials.ToStaticallySizedPublicKey(keypairs.Client1.PubKey)
+	require.NoError(t, err)
+	require.Equal(t, actualKey, connectedKeys[0])
+}
+
+func Test_GetNotificationChan(t *testing.T) {
+	keypairs := generateKeys(t)
+	pubKeys := []ed25519.PublicKey{keypairs.Client1.PubKey}
+
+	// Start the server
+	lis, s := setupServer(t,
+		wsrpc.Creds(keypairs.Server.PrivKey, pubKeys),
+	)
+
+	// Register the ping server implementation with the wsrpc server
+	pb.RegisterEchoServer(s, &echoServer{})
+
+	// Start serving
+	go s.Serve(lis)
+	t.Cleanup(s.Stop)
+
+	notifyChan := s.GetConnectionNotifyChan()
+
+	// Start client
+	conn, err := setupClientConn(t, 100*time.Millisecond,
+		wsrpc.WithTransportCreds(keypairs.Client1.PrivKey, keypairs.Server.PubKey),
+	)
+	require.NoError(t, err)
+	t.Cleanup(conn.Close)
+
+	waitForReadyConnection(t, conn)
+
+	// Wait for connection notification
+	select {
+	case <-notifyChan:
+		t.Log("received notification")
+	case <-time.After(3 * time.Second):
+		assert.Fail(t, "did not notify")
+	}
+}

server.go

@@ -358,7 +358,7 @@ func (s *Server) UpdatePublicKeys(pubKeys []ed25519.PublicKey) {
 // later release.
 func (s *Server) GetConnectionNotifyChan() <-chan struct{} {
 	s.mu.RLock()
-	defer s.mu.Unlock()
+	defer s.mu.RUnlock()
 	return s.connMgr.getNotifyChan()
 }
 
@@ -369,7 +369,7 @@ func (s *Server) GetConnectionNotifyChan() <-chan struct{} {
 // later release.
 func (s *Server) GetConnectedPeerPublicKeys() []credentials.StaticSizedPublicKey {
 	s.mu.RLock()
-	defer s.mu.Unlock()
+	defer s.mu.RUnlock()
 	return s.connMgr.getConnectionPublicKeys()
 }