Merge pull request #44 from onflow/jribbink/sc-merge-main

Merge `main` into `feature/stable-cadence`

.github/workflows/ci.yml

@@ -41,6 +41,7 @@ jobs:
         with:
           file: ./coverage.txt
           flags: unittests
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   lint:
     runs-on: ubuntu-latest

config/json/deploy.go

@@ -100,20 +100,9 @@ func transformDeploymentsToJSON(configDeployments config.Deployments) jsonDeploy
 					simple: c.Name,
 				})
 			} else {
-				args := make([]map[string]any, 0)
+				args := make([]any, 0)
 				for _, arg := range c.Args {
-					jsonEncoded, err := jsoncdc.Encode(arg)
-					if err != nil {
-						panic(err)
-					}
-
-					jsonMap := make(map[string]any)
-					err = json.Unmarshal(jsonEncoded, &jsonMap)
-					if err != nil {
-						panic(err)
-					}
-
-					args = append(args, jsonMap)
+					args = append(args, jsoncdc.Prepare(arg))
 				}
 
 				deployments = append(deployments, deployment{
@@ -139,8 +128,8 @@ func transformDeploymentsToJSON(configDeployments config.Deployments) jsonDeploy
 }
 
 type contractDeployment struct {
-	Name string           `json:"name"`
-	Args []map[string]any `json:"args"`
+	Name string `json:"name"`
+	Args []any  `json:"args"`
 }
 
 type deployment struct {

config/json/deploy_test.go

@@ -103,17 +103,23 @@ func Test_TransformDeployToJSON(t *testing.T) {
 		}
 	}`)
 
-	var jsonDeployments jsonDeployments
-	err := json.Unmarshal(b, &jsonDeployments)
+	var original jsonDeployments
+	err := json.Unmarshal(b, &original)
 	assert.NoError(t, err)
 
-	deployments, err := jsonDeployments.transformToConfig()
+	deployments, err := original.transformToConfig()
 	assert.NoError(t, err)
 
 	j := transformDeploymentsToJSON(deployments)
 	x, _ := json.Marshal(j)
 
-	assert.Equal(t, cleanSpecialChars(b), cleanSpecialChars(x))
+	// Unmarshal the config again to compare against the original
+	var result jsonDeployments
+	err = json.Unmarshal(x, &result)
+	assert.NoError(t, err)
+
+	// Check that result is same as original after transformation
+	assert.Equal(t, original, result)
 }
 
 func Test_DeploymentAdvanced(t *testing.T) {

schema.json

@@ -120,9 +120,7 @@
           "type": "string"
         },
         "args": {
-          "items": {
-            "type": "object"
-          },
+          "items": true,
           "type": "array"
         }
       },