From bd38f9220bbba049d7204833dfd36abf8f38cdb4 Mon Sep 17 00:00:00 2001 From: Brett Logan Date: Fri, 24 Jul 2020 13:38:51 -0400 Subject: [PATCH] Capitalize Function Names Short of creating a second application that calls the lowerCase version of functions, since Go requires the functions be exported, capitalizing them in the Node and Typescript chaincode seems the simplest solution Signed-off-by: Brett Logan --- .../chaincode-javascript/lib/assetTransfer.js | 36 +++++++++---------- .../chaincode-typescript/src/assetTransfer.ts | 36 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/asset-transfer-basic/chaincode-javascript/lib/assetTransfer.js b/asset-transfer-basic/chaincode-javascript/lib/assetTransfer.js index 7ce14c10..f36eff34 100644 --- a/asset-transfer-basic/chaincode-javascript/lib/assetTransfer.js +++ b/asset-transfer-basic/chaincode-javascript/lib/assetTransfer.js @@ -10,7 +10,7 @@ const { Contract } = require('fabric-contract-api'); class AssetTransfer extends Contract { - async initLedger(ctx) { + async InitLedger(ctx) { const assets = [ { ID: 'asset1', @@ -63,8 +63,8 @@ class AssetTransfer extends Contract { } } - // createAsset issues a new asset to the world state with given details. - async createAsset(ctx, id, color, size, owner, appraisedValue) { + // CreateAsset issues a new asset to the world state with given details. + async CreateAsset(ctx, id, color, size, owner, appraisedValue) { const asset = { ID: id, Color: color, @@ -75,8 +75,8 @@ class AssetTransfer extends Contract { return ctx.stub.putState(id, Buffer.from(JSON.stringify(asset))); } - // readAsset returns the asset stored in the world state with given id. - async readAsset(ctx, id) { + // ReadAsset returns the asset stored in the world state with given id. + async ReadAsset(ctx, id) { const assetJSON = await ctx.stub.getState(id); // get the asset from chaincode state if (!assetJSON || assetJSON.length === 0) { throw new Error(`The asset ${id} does not exist`); @@ -84,9 +84,9 @@ class AssetTransfer extends Contract { return assetJSON.toString(); } - // updateAsset updates an existing asset in the world state with provided parameters. - async updateAsset(ctx, id, color, size, owner, appraisedValue) { - const exists = await this.assetExists(ctx, id); + // UpdateAsset updates an existing asset in the world state with provided parameters. + async UpdateAsset(ctx, id, color, size, owner, appraisedValue) { + const exists = await this.AssetExists(ctx, id); if (!exists) { throw new Error(`The asset ${id} does not exist`); } @@ -102,31 +102,31 @@ class AssetTransfer extends Contract { return ctx.stub.putState(id, Buffer.from(JSON.stringify(updatedAsset))); } - // deleteAsset deletes an given asset from the world state. - async deleteAsset(ctx, id) { - const exists = await this.assetExists(ctx, id); + // DeleteAsset deletes an given asset from the world state. + async DeleteAsset(ctx, id) { + const exists = await this.AssetExists(ctx, id); if (!exists) { throw new Error(`The asset ${id} does not exist`); } return ctx.stub.deleteState(id); } - // assetExists returns true when asset with given ID exists in world state. - async assetExists(ctx, id) { + // AssetExists returns true when asset with given ID exists in world state. + async AssetExists(ctx, id) { const assetJSON = await ctx.stub.getState(id); return assetJSON && assetJSON.length > 0; } - // transferAsset updates the owner field of asset with given id in the world state. - async transferAsset(ctx, id, newOwner) { - const assetString = await this.readAsset(ctx, id); + // TransferAsset updates the owner field of asset with given id in the world state. + async TransferAsset(ctx, id, newOwner) { + const assetString = await this.ReadAsset(ctx, id); const asset = JSON.parse(assetString); asset.Owner = newOwner; return ctx.stub.putState(id, Buffer.from(JSON.stringify(asset))); } - // getAllAssets returns all assets found in the world state. - async getAllAssets(ctx) { + // GetAllAssets returns all assets found in the world state. + async GetAllAssets(ctx) { const allResults = []; // range query with empty string for startKey and endKey does an open-ended query of all assets in the chaincode namespace. for (const { key, value } of ctx.stub.getStateByRange('', '')) { diff --git a/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts b/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts index 5646ce54..0895685d 100644 --- a/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts +++ b/asset-transfer-basic/chaincode-typescript/src/assetTransfer.ts @@ -8,7 +8,7 @@ import {Asset} from './asset'; export class AssetTransfer extends Contract { @Transaction() - public async initLedger(ctx: Context) { + public async InitLedger(ctx: Context) { const assets: Asset[] = [ { ID: 'asset1', @@ -61,9 +61,9 @@ export class AssetTransfer extends Contract { } } - // createAsset issues a new asset to the world state with given details. + // CreateAsset issues a new asset to the world state with given details. @Transaction() - public async createAsset(ctx: Context, id: string, color: string, size: number, owner: string, appraisedValue: number) { + public async CreateAsset(ctx: Context, id: string, color: string, size: number, owner: string, appraisedValue: number) { const asset = { ID: id, Color: color, @@ -74,9 +74,9 @@ export class AssetTransfer extends Contract { await ctx.stub.putState(id, Buffer.from(JSON.stringify(asset))); } - // readAsset returns the asset stored in the world state with given id. + // ReadAsset returns the asset stored in the world state with given id. @Transaction(false) - public async readAsset(ctx: Context, id: string): Promise { + public async ReadAsset(ctx: Context, id: string): Promise { const assetJSON = await ctx.stub.getState(id); // get the asset from chaincode state if (!assetJSON || assetJSON.length === 0) { throw new Error(`The asset ${id} does not exist`); @@ -84,10 +84,10 @@ export class AssetTransfer extends Contract { return assetJSON.toString(); } - // updateAsset updates an existing asset in the world state with provided parameters. + // UpdateAsset updates an existing asset in the world state with provided parameters. @Transaction() - public async updateAsset(ctx: Context, id: string, color: string, size: number, owner: string, appraisedValue: number) { - const exists = await this.assetExists(ctx, id); + public async UpdateAsset(ctx: Context, id: string, color: string, size: number, owner: string, appraisedValue: number) { + const exists = await this.AssetExists(ctx, id); if (!exists) { throw new Error(`The asset ${id} does not exist`); } @@ -103,37 +103,37 @@ export class AssetTransfer extends Contract { return ctx.stub.putState(id, Buffer.from(JSON.stringify(updatedAsset))); } - // deleteAsset deletes an given asset from the world state. + // DeleteAsset deletes an given asset from the world state. @Transaction() - public async deleteAsset(ctx: Context, id: string) { - const exists = await this.assetExists(ctx, id); + public async DeleteAsset(ctx: Context, id: string) { + const exists = await this.AssetExists(ctx, id); if (!exists) { throw new Error(`The asset ${id} does not exist`); } return ctx.stub.deleteState(id); } - // assetExists returns true when asset with given ID exists in world state. + // AssetExists returns true when asset with given ID exists in world state. @Transaction(false) @Returns('boolean') - public async assetExists(ctx: Context, id: string): Promise { + public async AssetExists(ctx: Context, id: string): Promise { const assetJSON = await ctx.stub.getState(id); return assetJSON && assetJSON.length > 0; } - // transferAsset updates the owner field of asset with given id in the world state. + // TransferAsset updates the owner field of asset with given id in the world state. @Transaction() - public async transferAsset(ctx: Context, id: string, newOwner: string) { - const assetString = await this.readAsset(ctx, id); + public async TransferAsset(ctx: Context, id: string, newOwner: string) { + const assetString = await this.ReadAsset(ctx, id); const asset = JSON.parse(assetString); asset.Owner = newOwner; await ctx.stub.putState(id, Buffer.from(JSON.stringify(asset))); } - // getAllAssets returns all assets found in the world state. + // GetAllAssets returns all assets found in the world state. @Transaction(false) @Returns('string') - public async getAllAssets(ctx: Context): Promise { + public async GetAllAssets(ctx: Context): Promise { const allResults = []; // range query with empty string for startKey and endKey does an open-ended query of all assets in the chaincode namespace. for await (const {key, value} of ctx.stub.getStateByRange('', '')) {