@hyperledger/caliper-core - npm Package Compare versions

Comparing version 0.3.0-unstable-20200227121044 to 0.3.0-unstable-20200228110951

lib/worker/rate-control/compositeRate.js

@@ -85,3 +85,4 @@ /*
         this.activeControllerIndex = 0;
-        this.clientIdx = -1;
+        this.clientIdx = clientIdx + 1;
+        this.roundIndex = roundIdx;
         this.controllerSwitch = null;
@@ -91,3 +92,3 @@ this.logControllerChange = (this.options.logChange &&
 
-        this.__prepareControllers(clientIdx, roundIdx);
+        this.__prepareControllers();
     }
@@ -97,7 +98,5 @@
      * Internal method for preparing the controllers for further use.
-     * @param {number} clientIdx The 0-based index of the client who instantiates the controller.
-     * @param {number} roundIdx The 1-based index of the round the controller is instantiated in.
      * @private
      */
-    __prepareControllers(clientIdx, roundIdx) {
+    __prepareControllers() {
         let weights = this.options.weights;
@@ -142,3 +141,3 @@ let rateControllers = this.options.rateControllers;
 
-            let info = new ControllerData(weights[i], rateControllers[i], new RateControl(rateControllers[i], clientIdx, roundIdx));
+            let info = new ControllerData(weights[i], rateControllers[i], new RateControl(rateControllers[i], this.clientIdx, this.roundIndex));
             this.controllers.push(info);
@@ -145,0 +144,0 @@ }

lib/worker/rate-control/recordRate.js

@@ -50,2 +50,4 @@ /*
         super(opts);
+        this.roundIdx = roundIdx;
+        this.clientIdx = clientIdx + 1;
         this.records = [];
@@ -141,5 +143,2 @@
     async init(msg) {
-        this.roundIdx = msg.roundIdx;
-        this.clientIdx = msg.clientIdx + 1;
-
         // if we know the number of transactions beforehand, pre-allocate the array
@@ -146,0 +145,0 @@ if (msg.numb) {

lib/worker/rate-control/replayRate.js

@@ -45,5 +45,9 @@ /*
      * @param {object} opts Options for the rate controller.
+     * @param {number} clientIdx The 0-based index of the client who instantiates the controller.
+     * @param {number} roundIdx The 1-based index of the round the controller is instantiated in.
      */
-    constructor(opts) {
+    constructor(opts, clientIdx, roundIdx) {
         super(opts);
+        this.roundIdx = roundIdx;
+        this.clientIdx = clientIdx + 1;
         this.records = [];
@@ -127,5 +131,2 @@
     async init(msg) {
-        this.roundIdx = msg.roundIdx;
-        this.clientIdx = msg.clientIdx + 1;
-
         // resolve template path placeholders
@@ -132,0 +133,0 @@ this.pathTemplate = this.pathTemplate.replace(/<R>/gi, this.roundIdx.toString());

package.json

 {
     "name": "@hyperledger/caliper-core",
     "description": "Core Hyperledger Caliper module, used for running performance benchmarks that interact with blockchain technologies",
-    "version": "0.3.0-unstable-20200227121044",
+    "version": "0.3.0-unstable-20200228110951",
     "repository": {
@@ -6,0 +6,0 @@ "type": "git",

No alert changes

Improved metrics

Total package byte prevSize

462799

increased by0.01%

Lines of code

10339

increased by0.01%

No dependency changes