From 42026e2fd4da691ca7168da1655fb9bec8162084 Mon Sep 17 00:00:00 2001 From: Arnaud J Le Hors Date: Wed, 5 Aug 2020 12:48:00 -0700 Subject: [PATCH] Improve unmarshalling in asset-transfer-basic Go cc Although the current code works thanks to Go being quite forgiving when it comes to pointers, it doesn't exhibit the best coding style. This patch addresses this. Signed-off-by: Arnaud J Le Hors --- .../chaincode-go/chaincode/smartcontract.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go b/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go index 8b48798c..71e8dd84 100644 --- a/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go +++ b/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go @@ -82,13 +82,13 @@ func (s *SmartContract) ReadAsset(ctx contractapi.TransactionContextInterface, i return nil, fmt.Errorf("the asset %s does not exist", id) } - var asset *Asset + var asset Asset err = json.Unmarshal(assetJSON, &asset) if err != nil { return nil, err } - return asset, nil + return &asset, nil } // UpdateAsset updates an existing asset in the world state with provided parameters. @@ -173,12 +173,12 @@ func (s *SmartContract) GetAllAssets(ctx contractapi.TransactionContextInterface return nil, err } - var asset *Asset + var asset Asset err = json.Unmarshal(queryResponse.Value, &asset) if err != nil { return nil, err } - assets = append(assets, asset) + assets = append(assets, &asset) } return assets, nil