Fix benchmark drm

Signed-off-by: jiangyaoguo <[email protected]>
artdatai · Jul 30, 2018 · edd8649 · edd8649
1 parent f0d2666
commit edd8649
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 24 deletions.
diff --git a/benchmark/composer/composer-micro/query-asset.js b/benchmark/composer/composer-micro/query-asset.js
@@ -98,6 +98,6 @@ module.exports.run = function() {
         });
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve(true);
 };
diff --git a/benchmark/composer/composer-samples/basic-sample-network.js b/benchmark/composer/composer-samples/basic-sample-network.js
@@ -111,6 +111,6 @@ module.exports.run = function() {
     return bc.bcObj.submitTransaction(busNetConnections.get('admin'), transaction);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve(true);
 };
diff --git a/benchmark/composer/composer-samples/bond-network.js b/benchmark/composer/composer-samples/bond-network.js
@@ -92,6 +92,6 @@ module.exports.run = function() {
     return bc.bcObj.submitTransaction(busNetConnection, transaction);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve(true);
 };
diff --git a/benchmark/composer/composer-samples/digitalproperty-network.js b/benchmark/composer/composer-samples/digitalproperty-network.js
@@ -100,6 +100,6 @@ module.exports.run = function() {
     return bc.bcObj.submitTransaction(busNetConnection, transaction);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve(true);
 };
diff --git a/benchmark/composer/composer-samples/marbles-network.js b/benchmark/composer/composer-samples/marbles-network.js
@@ -102,6 +102,6 @@ module.exports.run = function() {
     return bc.bcObj.submitTransaction(busNetConnection, transaction);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve(true);
 };
diff --git a/benchmark/composer/composer-samples/perishable-network.js b/benchmark/composer/composer-samples/perishable-network.js
@@ -161,6 +161,6 @@ module.exports.run = function() {
     return bc.bcObj.submitTransaction(busNetConnection, transaction);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve(true);
 };
diff --git a/benchmark/composer/composer-samples/vehicle-lifecycle-network.js b/benchmark/composer/composer-samples/vehicle-lifecycle-network.js
@@ -201,6 +201,6 @@ module.exports.run = function() {
     return bc.bcObj.submitTransaction(busNetConnection, transaction);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve(true);
 };
diff --git a/benchmark/drm/publish.js b/benchmark/drm/publish.js
@@ -39,24 +39,27 @@ module.exports.run = function() {
         'info' : '',
         'item' : buf
     };
-    return bc.invokeSmartContract(contx, 'drm', 'v0', {verb : 'publish', item: JSON.stringify(item)}, 120);
+    return bc.invokeSmartContract(contx, 'drm', 'v0', {verb : 'publish', item: JSON.stringify(item)}, 120)
+        .then((results)=>{
+            for (let i in results){
+                let stat = results[i];
+                if(stat.IsCommitted()) {
+                    ids.push(stat.GetResult().toString());
+                }
+            }
+            return Promise.resolve(results);
+        });
 };
 
-module.exports.end = function(results) {
-    for (let i in results){
-        let stat = results[i];
-        if(stat.IsCommitted()) {
-            ids.push(stat.result.toString());
-        }
-    }
+module.exports.end = function() {
     return Promise.resolve();
 };
 /**********************
 * save published items' identity
 **********************/
 /*var idfile = './tmp/ids.log'
 var fs = require('fs');
-module.exports.end = function(results) {
+module.exports.end = function() {
      for (let i in results){
         let stat = results[i];
         if(stat.status === 'success') {

diff --git a/benchmark/drm/query.js b/benchmark/drm/query.js
@@ -25,6 +25,6 @@ module.exports.run = function() {
     return bc.queryState(contx, 'drm', 'v0', id);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve();
 };
diff --git a/benchmark/marbles/init.js b/benchmark/marbles/init.js
@@ -38,6 +38,6 @@ module.exports.run = function() {
         }, 30);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve();
 };
diff --git a/benchmark/marbles/query.js b/benchmark/marbles/query.js
@@ -35,6 +35,6 @@ module.exports.run = function() {
         }, 120);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve();
 };
diff --git a/benchmark/simple/open.js b/benchmark/simple/open.js
@@ -57,7 +57,7 @@ module.exports.run = function() {
     return bc.invokeSmartContract(contx, 'simple', 'v0', {verb: 'open', account: newAcc, money: initMoney}, 30);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve();
 };
 

diff --git a/benchmark/simple/query.js b/benchmark/simple/query.js
@@ -26,7 +26,7 @@ module.exports.run = function() {
     return bc.queryState(contx, 'simple', 'v0', acc);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     // do nothing
     return Promise.resolve();
 };
diff --git a/benchmark/smallbank/query.js b/benchmark/smallbank/query.js
@@ -25,7 +25,7 @@ module.exports.run = function() {
     return bc.queryState(contx, 'smallbank', 'v0', acc_num);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     // do nothing
     return Promise.resolve();
 };
diff --git a/benchmark/smallbank/smallbankOperations.js b/benchmark/smallbank/smallbankOperations.js
@@ -168,7 +168,7 @@ module.exports.run = function() {
     return bc.invokeSmartContract(contx, 'smallbank', '1.0', args, 30);
 };
 
-module.exports.end = function(results) {
+module.exports.end = function() {
     return Promise.resolve();
 };
 

diff --git a/src/comm/client/local-client.js b/src/comm/client/local-client.js
@@ -224,7 +224,7 @@ function doTest(msg) {
         }
     }).then(() => {
         clearUpdateInter();
-        return cb.end(results);
+        return cb.end();
     }).then(() => {
         if (resultStats.length > 0) {
             return Promise.resolve(resultStats[0]);