Update exchange reports

Author: braydonf

lib/exchange-report.js

@@ -6,23 +6,18 @@ var assert = require('assert');
  * Represents a report to a bridge regarding the result of a shard exchange
  * @constructor
  * @param {Object} options
- * @param {String} options.reporterId
- * @param {String} [options.farmerId]
- * @param {String} [options.clientId]
+ * @param {String} options.token
+ * @param {String} options.dataHash
  */
 function ExchangeReport(options = {}) {
-  /* eslint complexity: [2, 7] */
+  /* eslint complexity: [2, 8] */
   if (!(this instanceof ExchangeReport)) {
     return new ExchangeReport(options);
   }
 
-  assert(options.reporterId, 'Invalid reporterId');
-
   this._r = {
     dataHash: options.dataHash || null,
-    reporterId: options.reporterId,
-    farmerId: options.farmerId,
-    clientId: options.clientId,
+    token: options.token || null,
     exchangeStart: options.exchangeStart || null,
     exchangeEnd: options.exchangeEnd || null,
     exchangeResultCode: options.exchangeResultCode || null,

lib/network/protocol.js

@@ -382,8 +382,8 @@ Protocol.prototype.handleMirror = function(params, callback) {
 
       const hasher256 = crypto.createHash('sha256');
       const report = new ExchangeReport({
-        reporterId: self._network.contact.nodeID,
-        farmerId: params.farmer.nodeID
+        dataHash: hash,
+        token: token
       });
       const downloader = utils.createShardDownloader(
         new Contact(params.farmer),

lib/network/shard-server.js

@@ -263,8 +263,8 @@ ShardServer.prototype.routeConsignment = function(req, res) {
     }
 
     let report = new ExchangeReport({
-      reporterId: this._nodeID,
-      farmerId: this._nodeID
+      dataHash: hash,
+      token: token
     })
 
     report.begin(hash);
@@ -394,8 +394,8 @@ ShardServer.prototype.routeRetrieval = function(req, res) {
     }
 
     let report = new ExchangeReport({
-      reporterId: this._nodeID,
-      farmerId: this._nodeID
+      dataHash: hash,
+      token: token
     })
 
     // eslint-disable-next-line max-statements

test/exchange-report.unit.js

@@ -13,9 +13,7 @@ describe('Exchange Report', function() {
   it('#toObject', function() {
     var report = new ExchangeReport({
       dataHash: 'd8e33c898eb5ccd6789b32ceaca4e1d4e8cc452f',
-      reporterId: '538db66de92c02dc52cde37307ace5463917cbf0',
-      farmerId: '41ff35b1fac9981685b4423f91acc11ec345cd36',
-      clientId: '2c33e90b668313c96733b269a3f5c7b7ab2128e1',
+      token: '5412f65e73825adb616649cfddc552e8e188edd4',
       exchangeStart: 1479247169809,
       exchangeEnd: 1479250511087,
       exchangeResultCode: 1000,
@@ -24,9 +22,7 @@ describe('Exchange Report', function() {
 
     expect(report.toObject()).to.deep.equal({
       dataHash: 'd8e33c898eb5ccd6789b32ceaca4e1d4e8cc452f',
-      reporterId: '538db66de92c02dc52cde37307ace5463917cbf0',
-      farmerId: '41ff35b1fac9981685b4423f91acc11ec345cd36',
-      clientId: '2c33e90b668313c96733b269a3f5c7b7ab2128e1',
+      token: '5412f65e73825adb616649cfddc552e8e188edd4',
       exchangeStart: 1479247169809,
       exchangeEnd: 1479250511087,
       exchangeResultCode: 1000,
@@ -38,9 +34,7 @@ describe('Exchange Report', function() {
   describe('#begin/#end', function() {
     it('it should record start and end time', function() {
       var report = new ExchangeReport({
-        reporterId: '538db66de92c02dc52cde37307ace5463917cbf0',
-        farmerId: '41ff35b1fac9981685b4423f91acc11ec345cd36',
-        clientId: '2c33e90b668313c96733b269a3f5c7b7ab2128e1',
+        token: '89e1625e692c4546d6cda29231f6890cbb8c31b7'
       });
 
       expect(report._r.exchangeStart).to.equal(null);
@@ -57,9 +51,7 @@ describe('Exchange Report', function() {
       expect(report._r.exchangeEnd).to.equal(1479251141714);
 
       expect(report.toObject()).to.deep.equal({
-        reporterId: '538db66de92c02dc52cde37307ace5463917cbf0',
-        farmerId: '41ff35b1fac9981685b4423f91acc11ec345cd36',
-        clientId: '2c33e90b668313c96733b269a3f5c7b7ab2128e1',
+        token: '89e1625e692c4546d6cda29231f6890cbb8c31b7',
         dataHash: '55736f88e72c42e732defdbfda258cbe0f8be94b',
         exchangeStart: 1479251099379,
         exchangeEnd: 1479251141714,