Address review comments:

 * improve naming of functions and variables in `ProtocolHandshaker`
 * preserve statement for commit and rollback results for backwards
   compatibility

Author: lutovich

src/v1/internal/connector.js

@@ -179,7 +179,7 @@ class Connection {
   _initializeProtocol(buffer, protocolHandshaker) {
     try {
       // re-assign the protocol because version might be lower than we initially assumed
-      this._protocol = protocolHandshaker.readHandshakeResponse(buffer);
+      this._protocol = protocolHandshaker.createNegotiatedProtocol(buffer);
 
       // Ok, protocol running. Simply forward all messages to the dechunker
       this._ch.onmessage = buf => this._dechunker.write(buf);

src/v1/internal/protocol-handshaker.js

@@ -61,17 +61,17 @@ export default class ProtocolHandshaker {
   }
 
   /**
-   * Read and interpret the Bolt handshake response from the given buffer.
+   * Read the given handshake response and create the negotiated bolt protocol.
    * @param {BaseBuffer} buffer byte buffer containing the handshake response.
    * @return {BoltProtocol} bolt protocol corresponding to the version suggested by the database.
    * @throws {Neo4jError} when bolt protocol can't be instantiated.
    */
-  readHandshakeResponse(buffer) {
-    const proposedVersion = buffer.readInt32();
+  createNegotiatedProtocol(buffer) {
+    const negotiatedVersion = buffer.readInt32();
     if (this._log.isDebugEnabled()) {
-      this._log.debug(`${this._connection} negotiated protocol version ${proposedVersion}`);
+      this._log.debug(`${this._connection} negotiated protocol version ${negotiatedVersion}`);
     }
-    return this._createProtocolWithVersion(proposedVersion);
+    return this._createProtocolWithVersion(negotiatedVersion);
   }
 
   /**

src/v1/transaction.js

@@ -241,7 +241,7 @@ function finishTransaction(commit, connectionHolder, observer) {
 
   // for commit & rollback we need result that uses real connection holder and notifies it when
   // connection is not needed and can be safely released to the pool
-  return new Result(observer, '', {}, emptyMetadataSupplier, connectionHolder);
+  return new Result(observer, commit ? 'COMMIT' : 'ROLLBACK', {}, emptyMetadataSupplier, connectionHolder);
 }
 
 /**

test/internal/protocol-handshaker.test.js

@@ -54,35 +54,35 @@ describe('ProtocolHandshaker', () => {
     expect(writtenBuffers[0].toHex()).toEqual(`${boltMagicPreamble} ${protocolVersion2} ${protocolVersion1} ${noProtocolVersion} ${noProtocolVersion} `);
   });
 
-  it('should read handshake response containing valid protocol version', () => {
+  it('should create protocol with valid version', () => {
     const handshaker = new ProtocolHandshaker(null, null, null, false, Logger.noOp());
 
     // buffer with Bolt V1
     const buffer = handshakeResponse(1);
 
-    const protocol = handshaker.readHandshakeResponse(buffer);
+    const protocol = handshaker.createNegotiatedProtocol(buffer);
 
     expect(protocol).toBeDefined();
     expect(protocol).not.toBeNull();
     expect(protocol instanceof BoltProtocol).toBeTruthy();
   });
 
-  it('should read handshake response containing invalid protocol version', () => {
+  it('should fail to create protocol from invalid version', () => {
     const handshaker = new ProtocolHandshaker(null, null, null, false, Logger.noOp());
 
     // buffer with Bolt V42 which is invalid
     const buffer = handshakeResponse(42);
 
-    expect(() => handshaker.readHandshakeResponse(buffer)).toThrow();
+    expect(() => handshaker.createNegotiatedProtocol(buffer)).toThrow();
   });
 
-  it('should read handshake response containing HTTP as the protocol version', () => {
+  it('should fail to create protocol from HTTP as invalid version', () => {
     const handshaker = new ProtocolHandshaker(null, null, null, false, Logger.noOp());
 
     // buffer with HTTP magic int
     const buffer = handshakeResponse(1213486160);
 
-    expect(() => handshaker.readHandshakeResponse(buffer)).toThrow();
+    expect(() => handshaker.createNegotiatedProtocol(buffer)).toThrow();
   });
 
 });