Fix result not register

Author: freehere107

contract/ABI_test.go

@@ -1,15 +1,15 @@
 package contract
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/itering/scale.go/types"
 	"github.com/stretchr/testify/assert"
 )
 
 func Test_AbiParse(t *testing.T) {
-	c, err := ioutil.ReadFile("metadata.json")
+	c, err := os.ReadFile("metadata.json")
 	assert.NoError(t, err)
 
 	abi, err := InitAbi(c)

event_test.go

@@ -55,7 +55,7 @@ func RegCustomTypes(registry map[string]source.TypeStruct) {
 			if explainedType, ok := registry[typeString]; ok {
 				if explainedType.Type == "string" {
 					TypeRegistryLock.RLock()
-					instant := TypeRegistry[strings.ToLower(explainedType.TypeString)]
+					instant = TypeRegistry[strings.ToLower(explainedType.TypeString)]
 					TypeRegistryLock.RUnlock()
 					if instant != nil {
 						regCustomKey(key, instant)
@@ -121,6 +121,17 @@ func RegCustomTypes(registry map[string]source.TypeStruct) {
 					continue
 				}
 			}
+			// result
+			if strings.HasPrefix(typeString, "Result<") && strings.HasSuffix(typeString, ">") {
+				reg := regexp.MustCompile("^Result<(.+)>$")
+				typeParts := reg.FindStringSubmatch(typeString)
+				if len(typeParts) > 1 {
+					r := Result{}
+					r.SubType = typeParts[1]
+					regCustomKey(key, &r)
+					continue
+				}
+			}
 		case "struct":
 			var names, typeStrings []string
 			for _, v := range typeStruct.TypeMapping {

tools/merge.go

@@ -373,3 +373,10 @@ func TestU256(t *testing.T) {
 	m.Init(scaleBytes.ScaleBytes{Data: utiles.HexToBytes("0x00b5070000000000000000000000000000000000000000000000000000000000")}, nil)
 	assert.Equal(t, int64(505088), m.ProcessAndUpdateData("U256").(decimal.Decimal).IntPart())
 }
+
+func TestXcmV2ResultType(t *testing.T) {
+	raw := "0204031501020042f2f9dc"
+	m := ScaleDecoder{}
+	m.Init(scaleBytes.ScaleBytes{Data: utiles.HexToBytes(raw)}, nil)
+	assert.Equal(t, `{"V2":[{"QueryResponse":{"max_weight":0,"query_id":69,"response":{"ExecutionResult":{"Ok":3707368002}}}}]}`, utiles.ToString(m.ProcessAndUpdateData("VersionedXcm").(map[string]interface{})))
+}