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

Clean up Node Application and Address Linting Issues

Browse source 
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
This commit is contained in:
Brett Logan 2020-07-24 12:59:13 -04:00 committed by denyeart
parent 73a62a6780
commit 06c42bf68b
3 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
asset-transfer-basic/application-javascript/app.js
View file

@ -6,17 +6,17 @@
'use strict'; 'use strict';
const { Gateway, Wallets } = require('fabric-network'); const {Gateway, Wallets} = require('fabric-network');
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
const registerUser = require('./registerUser'); const registerUser = require('./registerUser');
const enrollAdmin = require('./enrollAdmin'); const enrollAdmin = require('./enrollAdmin');
const myChannel = 'mychannel'; const myChannel = 'mychannel';
const myChaincodeName = 'basic'; const myChaincodeName = 'basic';
function prettyJSONString(inputString) { function prettyJSONString(inputString) {
return JSON.stringify(JSON.parse(inputString),null,2); return JSON.stringify(JSON.parse(inputString), null, 2);
} }
// pre-requisites: // pre-requisites:
@ -41,22 +41,26 @@ async function main() {
// Steps: // Steps:
// Note: Steps 1 & 2 need to done only once in an app-server per blockchain network // Note: Steps 1 & 2 need to done only once in an app-server per blockchain network
// 1. register & enroll admin user with CA, stores admin identity in local wallet // 1. register & enroll admin user with CA, stores admin identity in local wallet
enrollAdmin.EnrollAdminUser(); await enrollAdmin.EnrollAdminUser();
// 2. register & enroll application user with CA, which is used as client identify to make chaincode calls, stores app user identity in local wallet // 2. register & enroll application user with CA, which is used as client identify to make chaincode calls, stores app user identity in local wallet
registerUser.RegisterAppUser(); await registerUser.RegisterAppUser();
// Check to see if app user exist in wallet. // Check to see if app user exist in wallet.
const identity = await wallet.get(registerUser.ApplicationUserId); const identity = await wallet.get(registerUser.ApplicationUserId);
if (!identity) { if (!identity) {
console.log('An identity for the user does not exist in the wallet: '+ registerUser.ApplicationUserId); console.log(`An identity for the user does not exist in the wallet: ${registerUser.ApplicationUserId}`);
return; return;
} }
//3. Prepare to call chaincode using fabric javascript node sdk //3. Prepare to call chaincode using fabric javascript node sdk
// Create a new gateway for connecting to our peer node. // Create a new gateway for connecting to our peer node.
const gateway = new Gateway(); const gateway = new Gateway();
await gateway.connect(ccp, { wallet, identity: registerUser.ApplicationUserId, discovery: { enabled: true, asLocalhost: true } }); await gateway.connect(ccp, {
wallet,
identity: registerUser.ApplicationUserId,
discovery: {enabled: true, asLocalhost: true}
});
try { try {
// Get the network (channel) our contract is deployed to. // Get the network (channel) our contract is deployed to.
const network = await gateway.getNetwork(myChannel); const network = await gateway.getNetwork(myChannel);
@ -72,40 +76,38 @@ async function main() {
// GetAllAssets returns all the current assets on the ledger // GetAllAssets returns all the current assets on the ledger
let result = await contract.evaluateTransaction('GetAllAssets'); let result = await contract.evaluateTransaction('GetAllAssets');
console.log('Evaluate Transaction: GetAllAssets, result: ' + prettyJSONString(result.toString()) ); console.log(`Evaluate Transaction: GetAllAssets, result: ${prettyJSONString(result.toString())}`);
console.log('\n***********************'); console.log('\n***********************');
console.log('Submit Transaction: CreateAsset asset13'); console.log('Submit Transaction: CreateAsset asset13');
//CreateAsset creates an asset with ID asset13, color yellow, owner Tom, size 5 and appraizedValue of 1300 //CreateAsset creates an asset with ID asset13, color yellow, owner Tom, size 5 and appraizedValue of 1300
await contract.submitTransaction('CreateAsset', 'asset13', 'yellow', 5, 'Tom', 1300); await contract.submitTransaction('CreateAsset', 'asset13', 'yellow', '5', 'Tom', '1300');
console.log('Evaluate Transaction: ReadAsset asset13'); console.log('Evaluate Transaction: ReadAsset asset13');
// ReadAsset returns an asset with given assetID // ReadAsset returns an asset with given assetID
result = await contract.evaluateTransaction('ReadAsset', 'asset13'); result = await contract.evaluateTransaction('ReadAsset', 'asset13');
console.log(' result: ' + prettyJSONString(result.toString()) ); console.log(` result: ${prettyJSONString(result.toString())}`);
console.log('\n***********************'); console.log('\n***********************');
console.log('Evaluate Transaction: AssetExists asset1'); console.log('Evaluate Transaction: AssetExists asset1');
// AssetExists returns 'true' if an asset with given assetID exist // AssetExists returns 'true' if an asset with given assetID exist
result = await contract.evaluateTransaction('AssetExists', 'asset1'); result = await contract.evaluateTransaction('AssetExists', 'asset1');
console.log(' result: ' + prettyJSONString(result.toString()) ); console.log(` result: ${prettyJSONString(result.toString())}`);
console.log('Submit Transaction: UpdateAsset asset1, new AppraisedValue : 350'); console.log('Submit Transaction: UpdateAsset asset1, new AppraisedValue : 350');
// UpdateAsset updates an existing asset with new properties. Same args as CreateAsset // UpdateAsset updates an existing asset with new properties. Same args as CreateAsset
await contract.submitTransaction('UpdateAsset', 'asset1', 'blue', 5, 'Tomoko', 350); await contract.submitTransaction('UpdateAsset', 'asset1', 'blue', '5', 'Tomoko', '350');
console.log('Evaluate Transaction: ReadAsset asset1'); console.log('Evaluate Transaction: ReadAsset asset1');
result = await contract.evaluateTransaction('ReadAsset', 'asset1'); result = await contract.evaluateTransaction('ReadAsset', 'asset1');
console.log(' result: ' + prettyJSONString(result.toString()) ); console.log(` result: ${prettyJSONString(result.toString())}`);
try { try {
console.log('\nSubmit Transaction: UpdateAsset asset70'); console.log('\nSubmit Transaction: UpdateAsset asset70');
//Non existing asset asset70 should throw Error //Non existing asset asset70 should throw Error
await contract.submitTransaction('UpdateAsset', 'asset70', 'blue', 5, 'Tomoko', 300); await contract.submitTransaction('UpdateAsset', 'asset70', 'blue', '5', 'Tomoko', '300');
} } catch (error) {
catch (error) { console.log(`Expected an error on UpdateAsset of non-existing Asset: ${error}`);
let errMsg = 'Expected an error on UpdateAsset of non-existing Asset. ';
console.log(errMsg + error);
} }
console.log('\n***********************'); console.log('\n***********************');
@ -115,7 +117,7 @@ async function main() {
console.log('Evaluate Transaction: ReadAsset asset1'); console.log('Evaluate Transaction: ReadAsset asset1');
result = await contract.evaluateTransaction('ReadAsset', 'asset1'); result = await contract.evaluateTransaction('ReadAsset', 'asset1');
console.log(' result: ' + prettyJSONString(result.toString()) ); console.log(` result: ${prettyJSONString(result.toString())}`);
} finally { } finally {
// Disconnect from the gateway peer when all work for this client identity is complete // Disconnect from the gateway peer when all work for this client identity is complete

4
asset-transfer-basic/application-javascript/package.json
View file

@ -15,8 +15,8 @@
"author": "Hyperledger", "author": "Hyperledger",
"license": "Apache-2.0", "license": "Apache-2.0",
"dependencies": { "dependencies": {
"fabric-ca-client": "^2.1.0", "fabric-ca-client": "2.2.0",
"fabric-network": "^2.1.0" "fabric-network": "2.2.0"
}, },
"devDependencies": { "devDependencies": {
"chai": "^4.2.0", "chai": "^4.2.0",

4
asset-transfer-basic/application-javascript/registerUser.js
View file

@ -35,7 +35,7 @@ async function registerAppUser() {
// Check to see if we've already enrolled the user. // Check to see if we've already enrolled the user.
const userIdentity = await wallet.get(applicationUserId); const userIdentity = await wallet.get(applicationUserId);
if (userIdentity) { if (userIdentity) {
console.log('An identity for the user '+applicationUserId+' already exists in the wallet'); console.log(`An identity for the user ${applicationUserId} already exists in the wallet`);
return; return;
} }
@ -71,7 +71,7 @@ async function registerAppUser() {
type: 'X.509', type: 'X.509',
}; };
await wallet.put(applicationUserId, x509Identity); await wallet.put(applicationUserId, x509Identity);
console.log('Successfully registered and enrolled user '+applicationUserId +' and imported it into the wallet'); console.log(`Successfully registered and enrolled user ${applicationUserId} and imported it into the wallet`);
} catch (error) { } catch (error) {
console.error(`Failed to register user : ${error}`); console.error(`Failed to register user : ${error}`);