Merge pull request hyperledger-caliper#122 from aklenik/update-worklo…

…ad-modules

Update benchmark workload modules to v0.4.0

benchmarks/api/fabric/lib/helper.js

@@ -97,7 +97,10 @@ module.exports.addBatchAssets = async function(bcObj, context, clientIdx, args,
                     }
                 }
 
-                await bcObj.invokeSmartContract('fixed-asset', undefined, myArgs, undefined, false);
+                myArgs.contractId = 'fixed-asset';
+                myArgs.readOnly = false;
+
+                await bcObj.sendRequests(myArgs);
             } catch (err) {
                 console.error('Error: ', err);
                 throw err;
@@ -176,10 +179,11 @@ module.exports.addMixedBatchAssets = async function(bcObj, context, clientIdx, a
         const batch = batches[index];
         try {
             const myArgs = {
+                contractId: 'fixed-asset',
                 contractFunction: 'createAssetsFromBatch',
                 contractArguments: [JSON.stringify(batch)]
             };
-            await bcObj.invokeSmartContract('fixed-asset', undefined, myArgs, undefined, false);
+            await bcObj.sendRequests(myArgs);
         } catch (err) {
             console.error('Error: ', err);
             throw err;

benchmarks/samples/fabric/fabcar/changeCarOwner.js

@@ -57,15 +57,18 @@ class ChangeCarOwnerWorkload extends WorkloadModuleBase {
         let newCarOwner = owners[Math.floor(Math.random() * owners.length)];
 
         let args = {
+            contractId: 'fabcar',
+            contractVersion: 'v1',
             contractFunction: 'changeCarOwner',
-            contractArguments: [carNumber, newCarOwner]
+            contractArguments: [carNumber, newCarOwner],
+            timeout: 60
         };
 
         if (this.txIndex === this.roundArguments.assets) {
             this.txIndex = 0;
         }
 
-        return this.sutAdapter.invokeSmartContract('fabcar', 'v1', args, 60);
+        await this.sutAdapter.sendRequests(args);
     }
 }
 

benchmarks/samples/fabric/fabcar/createCar.js

@@ -46,11 +46,14 @@ class CreateCarWorkload extends WorkloadModuleBase {
         let carOwner = owners[Math.floor(Math.random() * owners.length)];
 
         let args = {
+            contractId: 'fabcar',
+            contractVersion: 'v1',
             contractFunction: 'createCar',
-            contractArguments: [carNumber, carMake, carModel, carColor, carOwner]
+            contractArguments: [carNumber, carMake, carModel, carColor, carOwner],
+            timeout: 30
         };
 
-        return this.sutAdapter.invokeSmartContract('fabcar', 'v1', args, 30);
+        await this.sutAdapter.sendRequests(args);
     }
 }
 

benchmarks/samples/fabric/fabcar/helper.js

@@ -33,11 +33,14 @@ module.exports.createCar = async function (bc, contx, args, color, make, model,
         owner = owners[Math.floor(Math.random() * owners.length)];
 
         let myArgs = {
+            contractId: 'fabcar',
+            contractVersion: 'v1',
             contractFunction: 'createCar',
-            contractArguments: [carNumber, make, model, color, owner]
+            contractArguments: [carNumber, make, model, color, owner],
+            timeout: 30
         };
 
-        await bc.invokeSmartContract('fabcar', 'v1', myArgs, 30);
+        await bc.sendRequests(myArgs);
     }
 
 };

benchmarks/samples/fabric/fabcar/queryAllCars.js

@@ -55,11 +55,15 @@ class QueryAllCarsWorkload extends WorkloadModuleBase {
      */
     async submitTransaction() {
         let args = {
+            contractId: 'fabcar',
+            contractVersion: 'v1',
             contractFunction: 'queryAllCars',
-            contractArguments: [this.startingKey, this.endingKey]
+            contractArguments: [this.startingKey, this.endingKey],
+            timeout: 60,
+            readOnly: true
         };
 
-        return this.sutAdapter.querySmartContract('fabcar', 'v1', args, 60)
+        await this.sutAdapter.sendRequests(args);
     }
 }
 

benchmarks/samples/fabric/fabcar/queryCar.js

@@ -57,15 +57,19 @@ class QueryCarWorkload extends WorkloadModuleBase {
         let carNumber = 'Client' + this.workerIndex + '_CAR' + this.txIndex.toString();
 
         let args = {
+            contractId: 'fabcar',
+            contractVersion: 'v1',
             contractFunction: 'queryCar',
-            contractArguments: [carNumber]
+            contractArguments: [carNumber],
+            timeout: 30,
+            readOnly: true
         };
 
         if (this.txIndex === this.limitIndex) {
             this.txIndex = 0;
         }
 
-        return this.sutAdapter.querySmartContract('fabcar', 'v1', args, 30);
+        await this.sutAdapter.sendRequests(args);
     }
 }
 

benchmarks/samples/fabric/marbles/init.js

@@ -42,23 +42,15 @@ class InitWorkload extends WorkloadModuleBase {
         let marbleSize = (((this.txIndex % 10) + 1) * 10).toString(); // [10, 100]
         let marbleOwner = owners[this.txIndex % owners.length];
 
-        let args;
-        if (this.sutAdapter.getType() === 'fabric') {
-            args = {
-                contractFunction: 'initMarble',
-                contractArguments: [marbleName, marbleColor, marbleSize, marbleOwner],
-            };
-        } else {
-            args = {
-                verb: 'initMarble',
-                name: marbleName,
-                color: marbleColor,
-                size: marbleSize,
-                owner: marbleOwner
-            };
-        }
+        const args = {
+            contractId: 'marbles',
+            contractVersion: 'v1',
+            contractFunction: 'initMarble',
+            contractArguments: [marbleName, marbleColor, marbleSize, marbleOwner],
+            timeout: 30
+        };
 
-        return this.sutAdapter.invokeSmartContract('marbles', 'v1', args, 30);
+        await this.sutAdapter.sendRequests(args);
     }
 }
 

benchmarks/samples/fabric/marbles/query.js

@@ -37,21 +37,16 @@ class QueryWorkload extends WorkloadModuleBase {
     async submitTransaction() {
         this.txIndex++;
         let marbleOwner = owners[this.txIndex % owners.length];
-        let args;
-
-        if (this.sutAdapter.getType() === 'fabric') {
-            args = {
-                contractFunction: 'queryMarblesByOwner',
-                contractArguments: [marbleOwner]
-            };
-        } else {
-            args = {
-                verb: 'queryMarblesByOwner',
-                owner: marbleOwner
-            };
-        }
-
-        return this.sutAdapter.querySmartContract('marbles', 'v1', args, 120);
+        const args = {
+            contractId: 'marbles',
+            contractVersion: 'v1',
+            contractFunction: 'queryMarblesByOwner',
+            contractArguments: [marbleOwner],
+            timeout: 120,
+            readOnly: true
+        };
+
+        await this.sutAdapter.sendRequests(args);
     }
 }