🐛 Fix defaultValues initialization while updating assetType

assets/dynamicAssetTypeConfig.go

@@ -1,5 +1,7 @@
 package assets
 
+// ? Is there a way to not allow an asset be modified outside a transaction?
+
 // dynamicAssetTypeConfig is the configuration data for the Dynamic assetTypes feature
 var dynamicAssetTypeConfig = DynamicAssetType{}
 

transactions/deleteAssetType.go

@@ -10,6 +10,8 @@ import (
 	sw "github.com/goledgerdev/cc-tools/stubwrapper"
 )
 
+// ? Allow delete cascade?
+
 // DeleteAssetType is the transaction which deletes a dynamic Asset Type
 var DeleteAssetType = Transaction{
 	Tag:         "deleteAssetType",
@@ -140,7 +142,7 @@ func handleRegisteredAssets(stub *sw.StubWrapper, tag string, force bool) ([]int
 
 		_, err = asset.Delete(stub)
 		if err != nil {
-			return nil, errors.WrapError(err, "could not force delete asset")
+			return nil, errors.WrapError(err, "could not force delete AssetType assets")
 		}
 	}
 

transactions/updateAssetType.go

@@ -307,19 +307,19 @@ func initilizeDefaultValues(stub *sw.StubWrapper, assetTag string, defaultValues
 			return nil, errors.WrapErrorWithStatus(err, "failed to unmarshal queryResponse values", http.StatusInternalServerError)
 		}
 
+		for _, propMap := range defaultValuesMap {
+			propTag := propMap["tag"].(string)
+			if _, ok := data[propTag]; !ok {
+				data[propTag] = propMap["defaultValue"]
+			}
+		}
+
 		asset, err := assets.NewAsset(data)
 		if err != nil {
 			return nil, errors.WrapError(err, "could not assemble asset type")
 		}
 		assetMap := (map[string]interface{})(asset)
 
-		for _, propMap := range defaultValuesMap {
-			propTag := propMap["tag"].(string)
-			if _, ok := assetMap[propTag]; !ok {
-				assetMap[propTag] = propMap["defaultValue"]
-			}
-		}
-
 		assetMap, err = asset.Update(stub, assetMap)
 		if err != nil {
 			return nil, errors.WrapError(err, "failed to update asset")