Merge branch 'master' into master

Author: Simon Stone

packages/composer-connector-hlf/.istanbul.yml

@@ -4,7 +4,7 @@ instrumentation:
         - scripts/**
 check:
     global:
-        statements: 95
-        branches: 95
-        lines: 95
-        functions: 90
+        statements: 100
+        branches: 100
+        lines: 100
+        functions: 100

packages/composer-connector-hlf/lib/hfcconnectionmanager.js

@@ -118,6 +118,8 @@ class HFCConnectionManager extends ConnectionManager {
                     // Check to see that the certificate is not just whitespace.
                     let certificate = connectOptions.certificate.trim();
                     if (certificate) {
+                        // Certificates *must* end with a trailing newline.
+                        certificate += '\n';
                         grpcOptions.pem = certificate;
                     }
                 }

packages/composer-connector-hlf/test/hfcconnectionmanager.js

@@ -343,11 +343,11 @@ describe('HFCConnectionManager', () => {
 
                             // Check for the correct interactions with hfc.
                             sinon.assert.calledOnce(mockChain.setMemberServicesUrl);
-                            sinon.assert.calledWith(mockChain.setMemberServicesUrl, connectOptions.membershipServicesURL, { pem: '=== such certificate ===' });
+                            sinon.assert.calledWith(mockChain.setMemberServicesUrl, connectOptions.membershipServicesURL, { pem: '=== such certificate ===\n' });
                             sinon.assert.calledOnce(mockChain.addPeer);
-                            sinon.assert.calledWith(mockChain.addPeer, connectOptions.peerURL, { pem: '=== such certificate ===' });
+                            sinon.assert.calledWith(mockChain.addPeer, connectOptions.peerURL, { pem: '=== such certificate ===\n' });
                             sinon.assert.calledOnce(mockChain.eventHubConnect);
-                            sinon.assert.calledWith(mockChain.eventHubConnect, 'grpc://vp1', { pem: '=== such certificate ===' });
+                            sinon.assert.calledWith(mockChain.eventHubConnect, 'grpc://vp1', { pem: '=== such certificate ===\n' });
                             return true;
 
                         });
@@ -406,6 +406,24 @@ describe('HFCConnectionManager', () => {
             };
         });
 
+        it('should throw for a connection not created by the connection manager', () => {
+            let mockConnection = sinon.createStubInstance(HFCConnection);
+            mockConnection.getIdentifier.returns('not a real identifier');
+            (() => {
+                connectionManager.onDisconnect(mockConnection);
+            }).should.throw(/not created by connection manager/);
+        });
+
+        it('should throw for a connection already closed by the connection manager', () => {
+            let mockConnection = sinon.createStubInstance(HFCConnection);
+            let mockChain = sinon.createStubInstance(hfcChain);
+            mockConnection.getIdentifier.returns('not a real identifier');
+            connectionManager.chainPool['not a real identifier'] = { count: 0, chain: mockChain };
+            (() => {
+                connectionManager.onDisconnect(mockConnection);
+            }).should.throw(/already closed/);
+        });
+
         it('should call onDisconnect when client connection is disconnected', function() {
 
             // Set up the hfc mock.