From f1775d7fdc3e3532d58a9ec3b931ee17b02403f9 Mon Sep 17 00:00:00 2001 From: Tiffany Harris Date: Wed, 10 Jun 2020 08:13:46 -0400 Subject: [PATCH] Rename IssueAsset to CreateAsset - Move go chaincode to chaincode-go subdirectory - Add public description argument to CreateAsset() Signed-off-by: Tiffany Harris --- .../{ => chaincode-go}/README.md | 4 ++-- .../{ => chaincode-go}/asset_transfer.go | 9 ++++----- .../{ => chaincode-go}/asset_transfer_queries.go | 0 .../{ => chaincode-go}/go.mod | 0 .../{ => chaincode-go}/go.sum | 0 .../{ => chaincode-go}/images/transfer_assets_1.png | Bin .../{ => chaincode-go}/images/transfer_assets_2.png | Bin .../{ => chaincode-go}/images/transfer_assets_3.png | Bin .../images/transfer_assets_images.pptx | Bin 9 files changed, 6 insertions(+), 7 deletions(-) rename asset-transfer-secured-agreement/{ => chaincode-go}/README.md (99%) rename asset-transfer-secured-agreement/{ => chaincode-go}/asset_transfer.go (98%) rename asset-transfer-secured-agreement/{ => chaincode-go}/asset_transfer_queries.go (100%) rename asset-transfer-secured-agreement/{ => chaincode-go}/go.mod (100%) rename asset-transfer-secured-agreement/{ => chaincode-go}/go.sum (100%) rename asset-transfer-secured-agreement/{ => chaincode-go}/images/transfer_assets_1.png (100%) rename asset-transfer-secured-agreement/{ => chaincode-go}/images/transfer_assets_2.png (100%) rename asset-transfer-secured-agreement/{ => chaincode-go}/images/transfer_assets_3.png (100%) rename asset-transfer-secured-agreement/{ => chaincode-go}/images/transfer_assets_images.pptx (100%) diff --git a/asset-transfer-secured-agreement/README.md b/asset-transfer-secured-agreement/chaincode-go/README.md similarity index 99% rename from asset-transfer-secured-agreement/README.md rename to asset-transfer-secured-agreement/chaincode-go/README.md index f280f7cf..f863b5c4 100644 --- a/asset-transfer-secured-agreement/README.md +++ b/asset-transfer-secured-agreement/chaincode-go/README.md @@ -118,7 +118,7 @@ Now that we can operate as both organizations, we need install the private asset Open the Org1 terminal. Run the following command to package the private asset transfer chaincode: ``` -peer lifecycle chaincode package assets_transfer.tar.gz --path ../asset-transfer-secured-agreement --lang golang --label assets_transfer_1 +peer lifecycle chaincode package assets_transfer.tar.gz --path ../asset-transfer-secured-agreement/chaincode-go --lang golang --label assets_transfer_1 ``` The command creates a chaincode package named `assets_transfer.tar.gz`. We can now install this package on the Org1 peer: @@ -180,7 +180,7 @@ export asset_PROPERTIES=$(echo -n "{\"object_type\":\"asset_properties\",\"asset ``` We can now use the following command to create a asset that belongs to Org1: ``` -peer chaincode invoke -o localhost:7050 --ordererTLSHostnameOverride orderer.example.com --tls --cafile ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem -C mychannel -n assets_transfer -c '{"function":"IssueAsset","Args":["asset1"]}' --transient "{\"asset_properties\":\"$asset_PROPERTIES\"}" +peer chaincode invoke -o localhost:7050 --ordererTLSHostnameOverride orderer.example.com --tls --cafile ${PWD}/organizations/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem -C mychannel -n assets_transfer -c '{"function":"CreateAsset","Args":["asset1", "A new asset for Org1MSP"]}' --transient "{\"asset_properties\":\"$asset_PROPERTIES\"}" ``` We can can query the Org1 implicit data collection to see the asset that was created: diff --git a/asset-transfer-secured-agreement/asset_transfer.go b/asset-transfer-secured-agreement/chaincode-go/asset_transfer.go similarity index 98% rename from asset-transfer-secured-agreement/asset_transfer.go rename to asset-transfer-secured-agreement/chaincode-go/asset_transfer.go index 3702fe1e..21ea9a9a 100644 --- a/asset-transfer-secured-agreement/asset_transfer.go +++ b/asset-transfer-secured-agreement/chaincode-go/asset_transfer.go @@ -55,8 +55,8 @@ type receipt struct { timestamp time.Time } -// IssueAsset creates a asset and sets it as owned by the client's org -func (s *SmartContract) IssueAsset(ctx contractapi.TransactionContextInterface, assetID string) error { +// CreateAsset creates a asset and sets it as owned by the client's org +func (s *SmartContract) CreateAsset(ctx contractapi.TransactionContextInterface, assetID, publicDescription string) error { transMap, err := ctx.GetStub().GetTransient() if err != nil { @@ -76,13 +76,12 @@ func (s *SmartContract) IssueAsset(ctx contractapi.TransactionContextInterface, return fmt.Errorf("failed to get verified OrgID: %s", err.Error()) } - // Create and persit asset - + // Create and persist asset asset := Asset{ ObjectType: "asset", ID: assetID, OwnerOrg: clientOrgID, - PublicDescription: "A new asset for " + clientOrgID, + PublicDescription: publicDescription, } assetJSON, err := json.Marshal(asset) diff --git a/asset-transfer-secured-agreement/asset_transfer_queries.go b/asset-transfer-secured-agreement/chaincode-go/asset_transfer_queries.go similarity index 100% rename from asset-transfer-secured-agreement/asset_transfer_queries.go rename to asset-transfer-secured-agreement/chaincode-go/asset_transfer_queries.go diff --git a/asset-transfer-secured-agreement/go.mod b/asset-transfer-secured-agreement/chaincode-go/go.mod similarity index 100% rename from asset-transfer-secured-agreement/go.mod rename to asset-transfer-secured-agreement/chaincode-go/go.mod diff --git a/asset-transfer-secured-agreement/go.sum b/asset-transfer-secured-agreement/chaincode-go/go.sum similarity index 100% rename from asset-transfer-secured-agreement/go.sum rename to asset-transfer-secured-agreement/chaincode-go/go.sum diff --git a/asset-transfer-secured-agreement/images/transfer_assets_1.png b/asset-transfer-secured-agreement/chaincode-go/images/transfer_assets_1.png similarity index 100% rename from asset-transfer-secured-agreement/images/transfer_assets_1.png rename to asset-transfer-secured-agreement/chaincode-go/images/transfer_assets_1.png diff --git a/asset-transfer-secured-agreement/images/transfer_assets_2.png b/asset-transfer-secured-agreement/chaincode-go/images/transfer_assets_2.png similarity index 100% rename from asset-transfer-secured-agreement/images/transfer_assets_2.png rename to asset-transfer-secured-agreement/chaincode-go/images/transfer_assets_2.png diff --git a/asset-transfer-secured-agreement/images/transfer_assets_3.png b/asset-transfer-secured-agreement/chaincode-go/images/transfer_assets_3.png similarity index 100% rename from asset-transfer-secured-agreement/images/transfer_assets_3.png rename to asset-transfer-secured-agreement/chaincode-go/images/transfer_assets_3.png diff --git a/asset-transfer-secured-agreement/images/transfer_assets_images.pptx b/asset-transfer-secured-agreement/chaincode-go/images/transfer_assets_images.pptx similarity index 100% rename from asset-transfer-secured-agreement/images/transfer_assets_images.pptx rename to asset-transfer-secured-agreement/chaincode-go/images/transfer_assets_images.pptx