From ce5186008b78ec748f38e9a4e77acfb9f7739143 Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Thu, 29 Apr 2021 10:21:41 +0100 Subject: [PATCH] Correct index location (#443) Signed-off-by: Matthew B White --- .../statedb/couchdb/indexes/indexOwner.json | 0 .../lib/asset_transfer_ledger_chaincode.js | 16 ++++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) rename asset-transfer-ledger-queries/chaincode-javascript/{lib => }/META-INF/statedb/couchdb/indexes/indexOwner.json (100%) diff --git a/asset-transfer-ledger-queries/chaincode-javascript/lib/META-INF/statedb/couchdb/indexes/indexOwner.json b/asset-transfer-ledger-queries/chaincode-javascript/META-INF/statedb/couchdb/indexes/indexOwner.json similarity index 100% rename from asset-transfer-ledger-queries/chaincode-javascript/lib/META-INF/statedb/couchdb/indexes/indexOwner.json rename to asset-transfer-ledger-queries/chaincode-javascript/META-INF/statedb/couchdb/indexes/indexOwner.json diff --git a/asset-transfer-ledger-queries/chaincode-javascript/lib/asset_transfer_ledger_chaincode.js b/asset-transfer-ledger-queries/chaincode-javascript/lib/asset_transfer_ledger_chaincode.js index bdfce319..91e67126 100644 --- a/asset-transfer-ledger-queries/chaincode-javascript/lib/asset_transfer_ledger_chaincode.js +++ b/asset-transfer-ledger-queries/chaincode-javascript/lib/asset_transfer_ledger_chaincode.js @@ -181,7 +181,7 @@ class Chaincode extends Contract { async GetAssetsByRange(ctx, startKey, endKey) { let resultsIterator = await ctx.stub.getStateByRange(startKey, endKey); - let results = await this.GetAllResults(resultsIterator, false); + let results = await this._GetAllResults(resultsIterator, false); return JSON.stringify(results); } @@ -249,7 +249,7 @@ class Chaincode extends Contract { async GetQueryResultForQueryString(ctx, queryString) { let resultsIterator = await ctx.stub.getQueryResult(queryString); - let results = await this.GetAllResults(resultsIterator, false); + let results = await this._GetAllResults(resultsIterator, false); return JSON.stringify(results); } @@ -262,7 +262,7 @@ class Chaincode extends Contract { async GetAssetsByRangeWithPagination(ctx, startKey, endKey, pageSize, bookmark) { const {iterator, metadata} = await ctx.stub.getStateByRangeWithPagination(startKey, endKey, pageSize, bookmark); - const results = await this.GetAllResults(iterator, false); + const results = await this._GetAllResults(iterator, false); results.ResponseMetadata = { RecordsCount: metadata.fetched_records_count, @@ -282,7 +282,7 @@ class Chaincode extends Contract { async QueryAssetsWithPagination(ctx, queryString, pageSize, bookmark) { const {iterator, metadata} = await ctx.stub.getQueryResultWithPagination(queryString, pageSize, bookmark); - const results = await this.GetAllResults(iterator, false); + const results = await this._GetAllResults(iterator, false); results.ResponseMetadata = { RecordsCount: metadata.fetched_records_count, @@ -296,7 +296,7 @@ class Chaincode extends Contract { async GetAssetHistory(ctx, assetName) { let resultsIterator = await ctx.stub.getHistoryForKey(assetName); - let results = await this.GetAllResults(resultsIterator, true); + let results = await this._GetAllResults(resultsIterator, true); return JSON.stringify(results); } @@ -308,7 +308,11 @@ class Chaincode extends Contract { return assetState && assetState.length > 0; } - async GetAllResults(iterator, isHistory) { + // This is JavaScript so without Funcation Decorators, all functions are assumed + // to be transaction functions + // + // For internal functions... prefix them with _ + async _GetAllResults(iterator, isHistory) { let allResults = []; let res = await iterator.next(); while (!res.done) {