Merge branch 'development' into eclesio/grandpa-roundState-rpc

ChainSafe · Jul 9, 2021 · 32bbf8a · 32bbf8a
2 parents 0338913 + 6d38d76
commit 32bbf8a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/dot/rpc/modules/state.go b/dot/rpc/modules/state.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/lib/runtime"
-	"github.com/ChainSafe/gossamer/lib/scale"
+	"github.com/ChainSafe/gossamer/pkg/scale"
 )
 
 // StateCallRequest holds json fields
@@ -272,8 +272,9 @@ func (sm *StateModule) GetMetadata(r *http.Request, req *StateRuntimeMetadataQue
 		return err
 	}
 
-	decoded, err := scale.Decode(metadata, []byte{})
-	*res = StateMetadataResponse(common.BytesToHex(decoded.([]byte)))
+	var decoded []byte
+	err = scale.Unmarshal(metadata, &decoded)
+	*res = StateMetadataResponse(common.BytesToHex(decoded))
 	return err
 }
 

diff --git a/dot/rpc/modules/system.go b/dot/rpc/modules/system.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/ChainSafe/gossamer/lib/common"
 	"github.com/ChainSafe/gossamer/lib/crypto"
-	"github.com/ChainSafe/gossamer/lib/scale"
+	"github.com/ChainSafe/gossamer/pkg/scale"
 	ctypes "github.com/centrifuge/go-substrate-rpc-client/v3/types"
 )
 
@@ -196,12 +196,13 @@ func (sm *SystemModule) AccountNextIndex(r *http.Request, req *StringRequest, re
 	if err != nil {
 		return err
 	}
-	sdMeta, err := scale.Decode(rawMeta, []byte{})
+	var sdMeta []byte
+	err = scale.Unmarshal(rawMeta, &sdMeta)
 	if err != nil {
 		return err
 	}
 	var metadata ctypes.Metadata
-	err = ctypes.DecodeFromBytes(sdMeta.([]byte), &metadata)
+	err = ctypes.DecodeFromBytes(sdMeta, &metadata)
 	if err != nil {
 		return err
 	}