Make error message more informative when user tries to get keyless asset

assets/existsInLedger.go

@@ -31,10 +31,16 @@ func existsInLedger(stub *sw.StubWrapper, isPrivate bool, typeTag, key string) (
 
 // ExistsInLedger checks if asset currently has a state on the ledger.
 func (a *Asset) ExistsInLedger(stub *sw.StubWrapper) (bool, errors.ICCError) {
+	if a.Key() == "" {
+		return false, errors.NewCCError("asset key is empty", 500)
+	}
 	return existsInLedger(stub, a.IsPrivate(), a.TypeTag(), a.Key())
 }
 
 // ExistsInLedger checks if asset referenced by a key object currently has a state on the ledger.
 func (k *Key) ExistsInLedger(stub *sw.StubWrapper) (bool, errors.ICCError) {
+	if k.Key() == "" {
+		return false, errors.NewCCError("key is empty", 500)
+	}
 	return existsInLedger(stub, k.IsPrivate(), k.TypeTag(), k.Key())
 }

assets/get.go

@@ -10,6 +10,11 @@ import (
 func get(stub *sw.StubWrapper, pvtCollection, key string) (*Asset, errors.ICCError) {
 	var assetBytes []byte
 	var err error
+
+	if key == "" {
+		return nil, errors.NewCCError("key cannot be empty", 500)
+	}
+
 	if pvtCollection != "" {
 		assetBytes, err = stub.GetPrivateData(pvtCollection, key)
 	} else {

assets/key.go

@@ -95,7 +95,7 @@ func (k Key) TypeTag() string {
 
 // Key returns the asset's unique identifying key in the ledger.
 func (k Key) Key() string {
-	assetKey := k["@key"].(string)
+	assetKey, _ := k["@key"].(string)
 	return assetKey
 }
 

test/assets_existsInLedger_test.go

@@ -0,0 +1,47 @@
+package test
+
+import (
+	"testing"
+
+	"github.com/goledgerdev/cc-tools/assets"
+	sw "github.com/goledgerdev/cc-tools/stubwrapper"
+	"github.com/hyperledger/fabric-chaincode-go/shimtest"
+)
+
+func TestExistsInLedgerNoKey(t *testing.T) {
+	key := assets.Key{
+		"@assetType": "person",
+		// "@key":       "person:47061146-c642-51a1-844a-bf0b17cb5e19",
+	}
+
+	stub := shimtest.NewMockStub("org1MSP", new(testCC))
+	stub.MockTransactionStart("TestExistsInLedgerNoKey")
+	sw := &sw.StubWrapper{
+		Stub: stub,
+	}
+	_, err := key.ExistsInLedger(sw)
+	if err.Status() != 500 || err.Message() != "key is empty" {
+		t.FailNow()
+	}
+	stub.MockTransactionEnd("TestExistsInLedgerNoAssetKey")
+}
+
+func TestExistsInLedgerNoAssetKey(t *testing.T) {
+	asset := assets.Asset{
+		// "@key":         "person:47061146-c642-51a1-844a-bf0b17cb5e19",
+		"@assetType": "person",
+		"name":       "Maria",
+		"id":         "31820792048",
+	}
+
+	stub := shimtest.NewMockStub("org1MSP", new(testCC))
+	stub.MockTransactionStart("TestExistsInLedgerNoAssetKey")
+	sw := &sw.StubWrapper{
+		Stub: stub,
+	}
+	_, err := asset.ExistsInLedger(sw)
+	if err.Status() != 500 || err.Message() != "asset key is empty" {
+		t.FailNow()
+	}
+	stub.MockTransactionEnd("TestExistsInLedgerNoAssetKey")
+}

test/assets_get_test.go

@@ -208,3 +208,22 @@ func TestGetRecursiveWithPvtData(t *testing.T) {
 	}
 	stub.MockTransactionEnd("TestGetAsset")
 }
+
+func TestGetAssetNoKey(t *testing.T) {
+	stub := shimtest.NewMockStub("org1MSP", new(testCC))
+
+	personKey := assets.Key{
+		"@assetType": "person",
+		// "@key":       "person:47061146-c642-51a1-844a-bf0b17cb5e19",
+	}
+
+	stub.MockTransactionStart("TestGetAssetNoKey")
+	sw := &sw.StubWrapper{
+		Stub: stub,
+	}
+	_, err := personKey.Get(sw)
+	if err.Status() != 500 || err.Message() != "key cannot be empty" {
+		t.FailNow()
+	}
+	stub.MockTransactionEnd("TestGetAssetNoKey")
+}

test/assets_put_test.go

@@ -81,6 +81,7 @@ func TestPutAssetWithSubAsset(t *testing.T) {
 	}
 	book := assets.Asset{
 		"@assetType": "book",
+		"@key":       "book:a36a2920-c405-51c3-b584-dcd758338cb5",
 		"title":      "Meu Nome é Maria",
 		"author":     "Maria Viana",
 		"currentTenant": map[string]interface{}{