No trailing spaces in hex strings

Author: lutovich

src/v1/internal/buf.js

@@ -346,15 +346,17 @@ class BaseBuffer
    * Get string representation of buffer.
    * @return {string} Buffer as a string
    */
-  toHex () {
-    // TODO something like StringBuilder?
-    let out = "";
+  toHex() {
+    let out = '';
     for (let i = 0; i < this.length; i++) {
       let hexByte = this.getUInt8(i).toString(16);
-      if( hexByte.length == 1 ) {
-        hexByte = "0" + hexByte;
+      if (hexByte.length == 1) {
+        hexByte = '0' + hexByte;
+      }
+      out += hexByte;
+      if (i !== this.length - 1) {
+        out += ' ';
       }
-      out += hexByte + " "
     }
     return out;
   }

src/v1/internal/ch-dummy.js

@@ -22,7 +22,7 @@ import {CombinedBuffer} from './buf';
 const observer = {
   instance: null,
   updateInstance: (instance) => {
-    observer.instance = instance
+    observer.instance = instance;
   }
 };
 
@@ -40,21 +40,24 @@ class DummyChannel {
     return false;
   }
 
-  write( buf ) {
+  write(buf) {
     this.written.push(buf);
     observer.updateInstance(this);
   }
 
   toHex() {
-    var out = "";
-    for( var i=0; i<this.written.length; i++ ) {
+    let out = '';
+    for (let i = 0; i < this.written.length; i++) {
       out += this.written[i].toHex();
+      if (i !== this.written.length - 1) {
+        out += ' ';
+      }
     }
     return out;
   }
 
-  toBuffer () {
-    return new CombinedBuffer( this.written );
+  toBuffer() {
+    return new CombinedBuffer(this.written);
   }
 
   close(cb) {
@@ -71,4 +74,4 @@ class DummyChannel {
 
 const channel = DummyChannel;
 
-export { channel, observer }
+export {channel, observer};

test/internal/buf.test.js

@@ -37,7 +37,7 @@ describe('buffers', () => {
 
     // Then
     expect(str).toContain('( position=4 )\n  01 08 0f 7f');
-    expect(hex).toBe('01 08 0f 7f ');
+    expect(hex).toBe('01 08 0f 7f');
   });
 
   it('should read and write 8-bit unsigned integers', () => {
@@ -139,7 +139,7 @@ describe('buffers', () => {
     // When
     const hex = b.toHex();
     // Then
-    expect(hex).toBe('92 81 61 81 62 ');
+    expect(hex).toBe('92 81 61 81 62');
   });
 
   it('should decode list correctly', () => {

test/internal/chunking.test.js

@@ -35,7 +35,7 @@ describe('Chunker', function() {
     chunker.flush();
 
     // Then
-    expect( ch.toHex() ).toBe("00 08 00 00 00 01 00 00 00 02 ");
+    expect(ch.toHex()).toBe('00 08 00 00 00 01 00 00 00 02');
   });
   it('should chunk blobs larger than the output buffer', function() {
     // Given
@@ -47,7 +47,7 @@ describe('Chunker', function() {
     chunker.flush();
 
     // Then
-    expect( ch.toHex() ).toBe("00 02 01 02 00 02 03 04 00 02 05 06 ");
+    expect(ch.toHex()).toBe('00 02 01 02 00 02 03 04 00 02 05 06');
   });
   it('should include message boundaries', function() {
     // Given
@@ -61,7 +61,7 @@ describe('Chunker', function() {
     chunker.flush();
 
     // Then
-    expect( ch.toHex() ).toBe("00 04 00 00 00 01 00 00 00 04 00 00 00 02 ");
+    expect(ch.toHex()).toBe('00 04 00 00 00 01 00 00 00 04 00 00 00 02');
   });
 });
 
@@ -83,7 +83,7 @@ describe('Dechunker', function() {
 
     // Then
     expect( messages.length ).toBe( 1 );
-    expect( messages[0].toHex() ).toBe( "00 01 00 02 00 03 " );
+    expect(messages[0].toHex()).toBe('00 01 00 02 00 03');
   });
 
   it('should handle message split at any point', function() {
@@ -117,7 +117,7 @@ describe('Dechunker', function() {
 
       // Then, the output should be correct
       expect( messages.length ).toBe( 1 );
-      expect( messages[0].toHex() ).toBe( "01 00 02 00 00 00 03 04 00 00 00 05 " );
+      expect(messages[0].toHex()).toBe('01 00 02 00 00 00 03 04 00 00 00 05');
     };
   });
 });

test/internal/connection.test.js

@@ -113,7 +113,7 @@ describe('Connection', () => {
     const protocolVersion2 = '00 00 00 02';
     const protocolVersion1 = '00 00 00 01';
     const noProtocolVersion = '00 00 00 00';
-    expect(observer.instance.toHex()).toBe(`${boltMagicPreamble} ${protocolVersion3} ${protocolVersion2} ${protocolVersion1} ${noProtocolVersion} `);
+    expect(observer.instance.toHex()).toBe(`${boltMagicPreamble} ${protocolVersion3} ${protocolVersion2} ${protocolVersion1} ${noProtocolVersion}`);
   });
 
   it('should provide error message when connecting to http-port', done => {

test/internal/protocol-handshaker.test.js

@@ -42,7 +42,7 @@ describe('ProtocolHandshaker', () => {
     const protocolVersion1 = '00 00 00 01';
     const noProtocolVersion = '00 00 00 00';
 
-    expect(writtenBuffers[0].toHex()).toEqual(`${boltMagicPreamble} ${protocolVersion3} ${protocolVersion2} ${protocolVersion1} ${noProtocolVersion} `);
+    expect(writtenBuffers[0].toHex()).toEqual(`${boltMagicPreamble} ${protocolVersion3} ${protocolVersion2} ${protocolVersion1} ${noProtocolVersion}`);
   });
 
   it('should create protocol with valid version', () => {