Use Serialise and Deserialise options to types and makes its Globally accessible (#75)

* add global serde option

* rename function

* remove debug statement

* use defer

Co-authored-by: Miguel Hervas <miguel.hervas.lazaro@gmail.com>

Author: vedhavyas

client/client.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/centrifuge/go-substrate-rpc-client/config"
 	gethrpc "github.com/centrifuge/go-substrate-rpc-client/gethrpc"
-	"github.com/centrifuge/go-substrate-rpc-client/scale"
 	"github.com/centrifuge/go-substrate-rpc-client/types"
 )
 
@@ -34,11 +33,6 @@ type Client interface {
 		*gethrpc.ClientSubscription, error)
 
 	URL() string
-
-	//MetaData(cache bool) (*MetadataVersioned, error)
-	Opts() scale.EncoderOptions
-
-	SetOpts(options scale.EncoderOptions)
 }
 
 type client struct {
@@ -50,17 +44,6 @@ type client struct {
 	//metadataVersioned *MetadataVersioned
 
 	//metadataLock sync.RWMutex
-	opts scale.EncoderOptions
-}
-
-// Opts returns the Encoding Options required for this client
-func (c client) Opts() scale.EncoderOptions {
-	return c.opts
-}
-
-// SetOpts sets Encoder Options on client struct
-func (c *client) SetOpts(options scale.EncoderOptions) {
-	c.opts = options
 }
 
 // URL returns the URL the client connects to
@@ -99,7 +82,7 @@ func Connect(url string) (Client, error) {
 	if err != nil {
 		return nil, err
 	}
-	cc := client{*c, url, scale.EncoderOptions{}}
+	cc := client{*c, url}
 	return &cc, nil
 }
 

main_test.go

@@ -134,7 +134,7 @@ func Example_listenToBalanceChange() {
 		// inner loop for the changes within one of those notifications
 		for _, chng := range (<-sub.Chan()).Changes {
 			var current types.U128
-			if err = types.DecodeFromBytes(chng.StorageData, &current, api.Client.Opts()); err != nil {
+			if err = types.DecodeFromBytes(chng.StorageData, &current); err != nil {
 				panic(err)
 			}
 

rpc/author/pending_extrinsics.go

@@ -33,7 +33,7 @@ func (a *Author) PendingExtrinsics() ([]types.Extrinsic, error) {
 	xts := make([]types.Extrinsic, len(res))
 
 	for i, re := range res {
-		err = types.DecodeFromHexString(re, &xts[i], a.client.Opts())
+		err = types.DecodeFromHexString(re, &xts[i])
 		if err != nil {
 			return nil, err
 		}

rpc/author/submit_and_watch_extrinsic.go

@@ -68,7 +68,7 @@ func (a *Author) SubmitAndWatchExtrinsic(xt types.Extrinsic) (*ExtrinsicStatusSu
 
 	c := make(chan types.ExtrinsicStatus)
 
-	enc, err := types.EncodeToHexString(xt, xt.Opts)
+	enc, err := types.EncodeToHexString(xt)
 	if err != nil {
 		return nil, err
 	}

rpc/author/submit_extrinsic.go

@@ -20,7 +20,7 @@ import "github.com/centrifuge/go-substrate-rpc-client/types"
 
 // SubmitExtrinsic will submit a fully formatted extrinsic for block inclusion
 func (a *Author) SubmitExtrinsic(xt types.Extrinsic) (types.Hash, error) {
-	enc, err := types.EncodeToHexString(xt, xt.Opts)
+	enc, err := types.EncodeToHexString(xt)
 	if err != nil {
 		return types.Hash{}, err
 	}

rpc/main.go

@@ -40,8 +40,8 @@ func NewRPC(cl client.Client) (*RPC, error) {
 		return nil, err
 	}
 
-	opts := types.BuildOptsFromMetadata(meta)
-	cl.SetOpts(opts)
+	opts := types.SerDeOptionsFromMetadata(meta)
+	types.SetSerDeOptions(opts)
 
 	return &RPC{
 		Author: author.NewAuthor(cl),

rpc/state/get_child_keys.go

@@ -42,7 +42,7 @@ func (s *State) getChildKeys(childStorageKey, prefix types.StorageKey, blockHash
 
 	keys := make([]types.StorageKey, len(res))
 	for i, r := range res {
-		err = types.DecodeFromHexString(r, &keys[i], s.client.Opts())
+		err = types.DecodeFromHexString(r, &keys[i])
 		if err != nil {
 			return nil, err
 		}

rpc/state/get_child_storage.go

@@ -32,7 +32,7 @@ func (s *State) GetChildStorage(childStorageKey, key types.StorageKey, target in
 	if len(*raw) == 0 {
 		return false, nil
 	}
-	return true, types.DecodeFromBytes(*raw, target, s.client.Opts())
+	return true, types.DecodeFromBytes(*raw, target)
 }
 
 // GetChildStorageLatest retreives the child storage for a key for the latest block height and decodes them into the
@@ -45,7 +45,7 @@ func (s *State) GetChildStorageLatest(childStorageKey, key types.StorageKey, tar
 	if len(*raw) == 0 {
 		return false, nil
 	}
-	return true, types.DecodeFromBytes(*raw, target, s.client.Opts())
+	return true, types.DecodeFromBytes(*raw, target)
 }
 
 // GetChildStorageRaw retreives the child storage for a key as raw bytes, without decoding them

rpc/state/get_keys.go

@@ -40,7 +40,7 @@ func (s *State) getKeys(prefix types.StorageKey, blockHash *types.Hash) ([]types
 
 	keys := make([]types.StorageKey, len(res))
 	for i, r := range res {
-		err = types.DecodeFromHexString(r, &keys[i], s.client.Opts())
+		err = types.DecodeFromHexString(r, &keys[i])
 		if err != nil {
 			return nil, err
 		}

rpc/state/get_metadata.go

@@ -39,6 +39,6 @@ func (s *State) getMetadata(blockHash *types.Hash) (*types.Metadata, error) {
 	}
 
 	var metadata types.Metadata
-	err = types.DecodeFromHexString(res, &metadata, s.client.Opts())
+	err = types.DecodeFromHexString(res, &metadata)
 	return &metadata, err
 }