added support for eventType and tested it (#140)

cadence.go

@@ -19,7 +19,6 @@ func CadenceValueToJsonString(value cadence.Value) (string, error) {
 		return "", nil
 	}
 	j, err := json.MarshalIndent(result, "", "    ")
-
 	if err != nil {
 		return "", err
 	}
@@ -90,7 +89,7 @@ func CadenceValueToInterface(field cadence.Value) interface{} {
 	case cadence.Optional:
 		return CadenceValueToInterface(field.Value)
 	case cadence.Dictionary:
-		//fmt.Println("is dict ", field.ToGoValue(), " ", field.String())
+		// fmt.Println("is dict ", field.ToGoValue(), " ", field.String())
 		result := map[string]interface{}{}
 		for _, item := range field.Pairs {
 			value := CadenceValueToInterface(item.Value)
@@ -105,7 +104,7 @@ func CadenceValueToInterface(field cadence.Value) interface{} {
 		}
 		return result
 	case cadence.Struct:
-		//fmt.Println("is struct ", field.ToGoValue(), " ", field.String())
+		// fmt.Println("is struct ", field.ToGoValue(), " ", field.String())
 		result := map[string]interface{}{}
 		subStructNames := field.StructType.Fields
 
@@ -123,7 +122,7 @@ func CadenceValueToInterface(field cadence.Value) interface{} {
 		}
 		return result
 	case cadence.Array:
-		//fmt.Println("is array ", field.ToGoValue(), " ", field.String())
+		// fmt.Println("is array ", field.ToGoValue(), " ", field.String())
 		var result []interface{}
 		for _, item := range field.Values {
 			value := CadenceValueToInterface(item)
@@ -142,27 +141,38 @@ func CadenceValueToInterface(field cadence.Value) interface{} {
 	case cadence.Address:
 		return field.String()
 	case cadence.TypeValue:
-		//fmt.Println("is type ", field.ToGoValue(), " ", field.String())
+		// fmt.Println("is type ", field.ToGoValue(), " ", field.String())
 		return field.StaticType.ID()
 	case cadence.String:
-		//fmt.Println("is string ", field.ToGoValue(), " ", field.String())
+		// fmt.Println("is string ", field.ToGoValue(), " ", field.String())
 		value := getAndUnquoteString(field)
 		if value == "" {
 			return nil
 		}
 		return value
 
 	case cadence.UFix64:
-		//fmt.Println("is ufix64 ", field.ToGoValue(), " ", field.String())
+		// fmt.Println("is ufix64 ", field.ToGoValue(), " ", field.String())
 
 		float, _ := strconv.ParseFloat(field.String(), 64)
 		return float
 	case cadence.Fix64:
 		float, _ := strconv.ParseFloat(field.String(), 64)
 		return float
+	case cadence.Event:
+		result := map[string]interface{}{}
+
+		for i, subField := range field.Fields {
+			value := CadenceValueToInterface(subField)
+			if value != nil {
+				result[field.EventType.Fields[i].Identifier] = value
+			}
+		}
+
+		return result
 
 	default:
-		//fmt.Println("is fallthrough ", field.ToGoValue(), " ", field.String())
+		// fmt.Println("is fallthrough ", field.ToGoValue(), " ", field.String())
 
 		goValue := field.ToGoValue()
 		if goValue != nil {

cadence_test.go

@@ -18,7 +18,6 @@ type Cadencetest struct {
 }
 
 func TestCadenceValueToInterface(t *testing.T) {
-
 	foo := cadenceString("foo")
 	bar := cadenceString("bar")
 	emptyString := cadenceString("")
@@ -54,8 +53,17 @@ func TestCadenceValueToInterface(t *testing.T) {
 
 	cadenceAddress1 := cadence.BytesToAddress(address1.Bytes())
 
-	structTypeValue := cadence.NewTypeValue(&structType)
 	stringType := cadence.NewStringType()
+	cadenceEvent := cadence.NewEvent([]cadence.Value{foo}).WithType(&cadence.EventType{
+		QualifiedIdentifier: "TestEvent",
+		Fields: []cadence.Field{{
+			Type:       cadence.StringType{},
+			Identifier: "foo",
+		}},
+	},
+	)
+
+	structTypeValue := cadence.NewTypeValue(&structType)
 	stringTypeValue := cadence.NewTypeValue(&stringType)
 	ufix, _ := cadence.NewUFix64("42.0")
 	path := cadence.Path{Domain: common.PathDomainStorage, Identifier: "foo"}
@@ -84,6 +92,7 @@ func TestCadenceValueToInterface(t *testing.T) {
 		{autogold.Want("Emoji", "😁"), emoji},
 		{autogold.Want("EmojiDict", map[string]interface{}{"😁": "😁"}), emojiDict},
 		{autogold.Want("StoragePath", "/storage/foo"), path},
+		{autogold.Want("Event", map[string]interface{}{"foo": "foo"}), cadenceEvent},
 	}
 
 	for _, tc := range testCases {
@@ -101,7 +110,6 @@ func TestCadenceValueToJson(t *testing.T) {
 }
 
 func TestParseInputValue(t *testing.T) {
-
 	foo := "foo"
 
 	var strPointer *string = nil
@@ -132,11 +140,9 @@ func TestParseInputValue(t *testing.T) {
 			assert.Equal(t, string(cvj), string(vj))
 		})
 	}
-
 }
 
 func TestMarshalCadenceStruct(t *testing.T) {
-
 	val, err := InputToCadence(Foo{Bar: "foo"}, func(string) (string, error) {
 		return "A.123.Foo.Bar", nil
 	})
@@ -145,11 +151,9 @@ func TestMarshalCadenceStruct(t *testing.T) {
 	jsonVal, err := CadenceValueToJsonString(val)
 	assert.NoError(t, err)
 	assert.JSONEq(t, `{ "bar": "foo" }`, jsonVal)
-
 }
 
 func TestMarshalCadenceStructWithStructTag(t *testing.T) {
-
 	val, err := InputToCadence(Foo{Bar: "foo"}, func(string) (string, error) {
 		return "A.123.Foo.Baz", nil
 	})
@@ -158,7 +162,6 @@ func TestMarshalCadenceStructWithStructTag(t *testing.T) {
 	jsonVal, err := CadenceValueToJsonString(val)
 	assert.NoError(t, err)
 	assert.JSONEq(t, `{ "bar": "foo" }`, jsonVal)
-
 }
 
 func TestPrimitiveInputToCadence(t *testing.T) {