epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-22 17:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-enable CI tests for asset-transfer-private-data JS app

Browse source 
Re-enable CI tests for asset-transfer-private-data JavaScript application.

Also re-add the error when private asset details are not found in the collection,
so that the CLI instructions work as desired, and to demonstrate error
handing in the client application.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This commit is contained in:
David Enyeart 2020-08-17 17:42:42 -04:00 committed by denyeart
parent 8bb870f930
commit b3bc39ae5f
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
asset-transfer-private-data/application-javascript/app.js
View file

@ -123,7 +123,7 @@ async function main() {
let asset2Data = { objectType: assetType, assetID: assetID2, color: 'blue', size: 35, appraisedValue: 727 }; let asset2Data = { objectType: assetType, assetID: assetID2, color: 'blue', size: 35, appraisedValue: 727 };
console.log('\n**************** As Org1 Client ****************'); console.log('\n**************** As Org1 Client ****************');
console.log('Adding Assets to work with: Submit Transaction: CreateAsset ' + assetID1); console.log('Adding Assets to work with:\n--> Submit Transaction: CreateAsset ' + assetID1);
let statefulTxn = contractOrg1.createTransaction('CreateAsset'); let statefulTxn = contractOrg1.createTransaction('CreateAsset');
//if you need to customize endorsement to specific set of Orgs, use setEndorsingOrganizations //if you need to customize endorsement to specific set of Orgs, use setEndorsingOrganizations
//statefulTxn.setEndorsingOrganizations(mspOrg1); //statefulTxn.setEndorsingOrganizations(mspOrg1);

1
asset-transfer-private-data/chaincode-go/private_asset_queries.go
View file

@ -147,7 +147,6 @@ func (s *SmartContract) QueryAssetByOwner(ctx contractapi.TransactionContextInte
return queryResults, nil return queryResults, nil
} }
// QueryAssets uses a query string to perform a query for assets. // QueryAssets uses a query string to perform a query for assets.
// Query string matching state database syntax is passed in and executed as is. // Query string matching state database syntax is passed in and executed as is.
// Supports ad hoc queries that can be defined at runtime by the client. // Supports ad hoc queries that can be defined at runtime by the client.

14
ci/scripts/run-test-network-private.sh
View file

@ -15,7 +15,7 @@ function createNetwork() {
print "Creating network" print "Creating network"
./network.sh up createChannel -ca -s couchdb -i "${FABRIC_VERSION}" ./network.sh up createChannel -ca -s couchdb -i "${FABRIC_VERSION}"
print "Deploying ${CHAINCODE_NAME} chaincode" print "Deploying ${CHAINCODE_NAME} chaincode"
./network.sh deployCC -ccn "${CHAINCODE_NAME}" -ccv 1 -ccs 1 -ccl "${CHAINCODE_LANGUAGE}" ./network.sh deployCC -ccn "${CHAINCODE_NAME}" -ccv 1 -ccs 1 -ccl "${CHAINCODE_LANGUAGE}" -ccep "OR('Org1MSP.peer','Org2MSP.peer')" -cccg ../asset-transfer-private-data/chaincode-go/collections_config.json
} }
function stopNetwork() { function stopNetwork() {
@ -25,10 +25,10 @@ function stopNetwork() {
# Run Javascript application # Run Javascript application
createNetwork createNetwork
#print "Initializing Javascript application" print "Initializing Javascript application"
#pushd ../asset-transfer-private-data/application-javascript pushd ../asset-transfer-private-data/application-javascript
#npm install npm install
#print "Executing app.js" print "Executing app.js"
#node app.js node app.js
#popd popd
stopNetwork stopNetwork