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

Remove QueryResult Type

Browse source 
There was no need for GetAllAssets to return a custom type,
it can simple return an array of all assets.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
This commit is contained in:
Brett Logan 2020-07-15 12:50:02 -04:00 committed by denyeart
parent c621ca9eb4
commit 14e9ccf85b
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
asset-transfer-basic/chaincode-go/chaincode/smartcontract.go
View file

@ -21,12 +21,6 @@ type Asset struct {
AppraisedValue int `json:"appraisedValue"` AppraisedValue int `json:"appraisedValue"`
} }
// QueryResult structure used for handling result of query
type QueryResult struct {
Key string `json:"Key"`
Record *Asset
}
// InitLedger adds a base set of assets to the ledger // InitLedger adds a base set of assets to the ledger
func (s *SmartContract) InitLedger(ctx contractapi.TransactionContextInterface) error { func (s *SmartContract) InitLedger(ctx contractapi.TransactionContextInterface) error {
assets := []Asset{ assets := []Asset{
@ -163,7 +157,7 @@ func (s *SmartContract) TransferAsset(ctx contractapi.TransactionContextInterfac
} }
// GetAllAssets returns all assets found in world state // GetAllAssets returns all assets found in world state
func (s *SmartContract) GetAllAssets(ctx contractapi.TransactionContextInterface) ([]QueryResult, error) { func (s *SmartContract) GetAllAssets(ctx contractapi.TransactionContextInterface) ([]*Asset, error) {
// range query with empty string for startKey and endKey does an // range query with empty string for startKey and endKey does an
// open-ended query of all assets in the chaincode namespace. // open-ended query of all assets in the chaincode namespace.
resultsIterator, err := ctx.GetStub().GetStateByRange("", "") resultsIterator, err := ctx.GetStub().GetStateByRange("", "")
@ -172,7 +166,7 @@ func (s *SmartContract) GetAllAssets(ctx contractapi.TransactionContextInterface
} }
defer resultsIterator.Close() defer resultsIterator.Close()
var results []QueryResult var assets []*Asset
for resultsIterator.HasNext() { for resultsIterator.HasNext() {
queryResponse, err := resultsIterator.Next() queryResponse, err := resultsIterator.Next()
if err != nil { if err != nil {
@ -184,10 +178,8 @@ func (s *SmartContract) GetAllAssets(ctx contractapi.TransactionContextInterface
if err != nil { if err != nil {
return nil, err return nil, err
} }
assets = append(assets, asset)
queryResult := QueryResult{Key: queryResponse.Key, Record: asset}
results = append(results, queryResult)
} }
return results, nil return assets, nil
} }

2
asset-transfer-basic/chaincode-go/chaincode/smartcontract_test.go
View file

@ -169,7 +169,7 @@ func TestGetAllAssets(t *testing.T) {
assetTransfer := &chaincode.SmartContract{} assetTransfer := &chaincode.SmartContract{}
assets, err := assetTransfer.GetAllAssets(transactionContext) assets, err := assetTransfer.GetAllAssets(transactionContext)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, []chaincode.QueryResult{{Record: asset}}, assets) require.Equal(t, []*chaincode.Asset{asset}, assets)
iterator.HasNextReturns(true) iterator.HasNextReturns(true)
iterator.NextReturns(nil, fmt.Errorf("failed retrieving next item")) iterator.NextReturns(nil, fmt.Errorf("failed retrieving next item"))