Sync stable-cadence branch with master

encoding/ccf/decode.go

@@ -2003,8 +2003,12 @@ func (d *Decoder) decodeFunctionTypeValue(visited *cadenceTypeByCCFTypeID) (cade
 		return nil, errors.New("unexpected nil function return type")
 	}
 
+	// TODO:
+	purity := cadence.FunctionPurityUnspecified
+
 	return cadence.NewMeteredFunctionType(
 		d.gauge,
+		purity,
 		typeParameters,
 		parameters,
 		returnType,

encoding/ccf/encode.go

@@ -61,7 +61,6 @@ func Encode(value cadence.Value) ([]byte, error) {
 	var w bytes.Buffer
 
 	enc := NewEncoder(&w)
-	defer enc.enc.Close()
 
 	err := enc.Encode(value)
 	if err != nil {

encoding/json/encoding_test.go

@@ -2459,15 +2459,16 @@ func TestEncodeType(t *testing.T) {
 					Parameters: []cadence.Parameter{
 						{Label: "qux", Identifier: "baz", Type: cadence.StringType{}},
 					},
-					ReturnType: cadence.IntType{},
+					ReturnType:     cadence.IntType{},
+					TypeParameters: []cadence.TypeParameter{},
 				},
 			},
 			`{"type":"Type","value":{"staticType":
 				{	
 					"kind" : "Function",
-					"typeID":"Foo", 
 					"purity": "view",
-					"return" : {"kind" : "Int"}, 
+					"return" : {"kind" : "Int"},
+					"typeParameters": [],
 					"parameters" : [
 						{"label" : "qux", "id" : "baz", "type": {"kind" : "String"}}
 					]}
@@ -2482,8 +2483,8 @@ func TestEncodeType(t *testing.T) {
 		encodedValue := `{"type":"Type","value":{"staticType":
 			{	
 				"kind" : "Function",
-				"typeID":"Foo", 
-				"return" : {"kind" : "Int"}, 
+				"return" : {"kind" : "Int"},
+				"typeParameters": [],
 				"parameters" : [
 					{"label" : "qux", "id" : "baz", "type": {"kind" : "String"}}
 				]}
@@ -2495,7 +2496,8 @@ func TestEncodeType(t *testing.T) {
 				Parameters: []cadence.Parameter{
 					{Label: "qux", Identifier: "baz", Type: cadence.StringType{}},
 				},
-				ReturnType: cadence.IntType{},
+				ReturnType:     cadence.IntType{},
+				TypeParameters: []cadence.TypeParameter{},
 			},
 		}
 

types_test.go

@@ -190,7 +190,7 @@ func TestType_ID(t *testing.T) {
 				},
 				ReturnType: StringType{},
 			},
-			"((Int):String)",
+			"fun(Int):String",
 		},
 		{
 			&EventType{