From fb082a04c34b1a726e6eee98a6197b0ca7d00c68 Mon Sep 17 00:00:00 2001
From: Adam Nielsen <adam.nielsen@uq.edu.au>
Date: Thu, 7 Feb 2019 13:27:45 +1000
Subject: [PATCH] refactor(client): Remove 'broadcast' from naming of iAm and
 iHave functions

---
 lib/client.js                                               | 4 ++--
 lib/services/{i-am-broadcast.js => i-am.js}                 | 0
 lib/services/{i-have-broadcast.js => i-have.js}             | 0
 lib/services/index.js                                       | 4 ++--
 test/unit/service-i-am.spec.js                              | 6 +++---
 ...vice-i-have-broadcast.spec.js => service-i-have.spec.js} | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename lib/services/{i-am-broadcast.js => i-am.js} (100%)
 rename lib/services/{i-have-broadcast.js => i-have.js} (100%)
 rename test/unit/{service-i-have-broadcast.spec.js => service-i-have.spec.js} (62%)

diff --git a/lib/client.js b/lib/client.js
index 96e09098..aa2064bb 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -1133,7 +1133,7 @@ class Client extends EventEmitter {
     const buffer = this._getBuffer(receiver && receiver.forwardedFrom);
     baNpdu.encode(buffer, baEnum.NpduControlPriority.NORMAL_MESSAGE, receiver);
     baApdu.encodeUnconfirmedServiceRequest(buffer, baEnum.PduTypes.UNCONFIRMED_REQUEST, baEnum.UnconfirmedServiceChoice.I_AM);
-    baServices.iAmBroadcast.encode(buffer, deviceId, this._transport.getMaxPayload(), segmentation, vendorId);
+    baServices.iAm.encode(buffer, deviceId, this._transport.getMaxPayload(), segmentation, vendorId);
     this.sendBvlc(receiver, buffer);
   }
 
@@ -1141,7 +1141,7 @@ class Client extends EventEmitter {
     const buffer = this._getBuffer(receiver && receiver.forwardedFrom);
     baNpdu.encode(buffer, baEnum.NpduControlPriority.NORMAL_MESSAGE, receiver);
     baApdu.EecodeUnconfirmedServiceRequest(buffer, baEnum.PduTypes.UNCONFIRMED_REQUEST, baEnum.UnconfirmedServiceChoice.I_HAVE);
-    baServices.EncodeIhaveBroadcast(buffer, deviceId, objectId, objectName);
+    baServices.iHave(buffer, deviceId, objectId, objectName);
     this.sendBvlc(receiver, buffer);
   }
 
diff --git a/lib/services/i-am-broadcast.js b/lib/services/i-am.js
similarity index 100%
rename from lib/services/i-am-broadcast.js
rename to lib/services/i-am.js
diff --git a/lib/services/i-have-broadcast.js b/lib/services/i-have.js
similarity index 100%
rename from lib/services/i-have-broadcast.js
rename to lib/services/i-have.js
diff --git a/lib/services/index.js b/lib/services/index.js
index 9f6c770a..9d4a6431 100644
--- a/lib/services/index.js
+++ b/lib/services/index.js
@@ -15,8 +15,8 @@ module.exports.eventInformation = require('./event-information');
 module.exports.eventNotifyData = require('./event-notify-data');
 module.exports.getEnrollmentSummary = require('./get-enrollment-summary');
 module.exports.getEventInformation = require('./get-event-information');
-module.exports.iAmBroadcast = require('./i-am-broadcast');
-module.exports.iHaveBroadcast = require('./i-have-broadcast');
+module.exports.iAm = require('./i-am');
+module.exports.iHave = require('./i-have');
 module.exports.lifeSafetyOperation = require('./life-safety-operation');
 module.exports.privateTransfer = require('./private-transfer');
 module.exports.readProperty = require('./read-property');
diff --git a/test/unit/service-i-am.spec.js b/test/unit/service-i-am.spec.js
index a0328fc5..5d822a60 100644
--- a/test/unit/service-i-am.spec.js
+++ b/test/unit/service-i-am.spec.js
@@ -4,11 +4,11 @@ const expect      = require('chai').expect;
 const utils       = require('./utils');
 const baServices  = require('../../lib/services');
 
-describe('bacstack - Services layer Iam unit', () => {
+describe('bacstack - Services layer iAm unit', () => {
   it('should successfully encode and decode', () => {
     const buffer = utils.getBuffer();
-    baServices.iAmBroadcast.encode(buffer, 47, 1, 1, 7);
-    const result = baServices.iAmBroadcast.decode(buffer.buffer, 0);
+    baServices.iAm.encode(buffer, 47, 1, 1, 7);
+    const result = baServices.iAm.decode(buffer.buffer, 0);
     delete result.len;
     expect(result).to.deep.equal({
       deviceId: 47,
diff --git a/test/unit/service-i-have-broadcast.spec.js b/test/unit/service-i-have.spec.js
similarity index 62%
rename from test/unit/service-i-have-broadcast.spec.js
rename to test/unit/service-i-have.spec.js
index 7cb0980c..f78a5fd4 100644
--- a/test/unit/service-i-have-broadcast.spec.js
+++ b/test/unit/service-i-have.spec.js
@@ -4,11 +4,11 @@ const expect      = require('chai').expect;
 const utils       = require('./utils');
 const baServices  = require('../../lib/services');
 
-describe('bacstack - Services layer IhaveBroadcast unit', () => {
+describe('bacstack - Services layer iHave unit', () => {
   it('should successfully encode and decode', () => {
     const buffer = utils.getBuffer();
-    baServices.iHaveBroadcast.encode(buffer, {type: 8, instance: 443}, {type: 0, instance: 4}, 'LgtCmd01');
-    const result = baServices.iHaveBroadcast.decode(buffer.buffer, 0, buffer.offset);
+    baServices.iHave.encode(buffer, {type: 8, instance: 443}, {type: 0, instance: 4}, 'LgtCmd01');
+    const result = baServices.iHave.decode(buffer.buffer, 0, buffer.offset);
     delete result.len;
     expect(result).to.deep.equal({
       deviceId: {type: 8, instance: 443},