From e263af0d160428a8abf3e6e1e6bb94d7d8571a67 Mon Sep 17 00:00:00 2001 From: jimjbrettj Date: Mon, 5 Jul 2021 13:46:39 -0600 Subject: [PATCH 1/4] scale into messages_test --- dot/core/messages_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dot/core/messages_test.go b/dot/core/messages_test.go index 6b718b0d5c..23411bea98 100644 --- a/dot/core/messages_test.go +++ b/dot/core/messages_test.go @@ -29,7 +29,7 @@ import ( "github.com/ChainSafe/gossamer/lib/crypto/sr25519" "github.com/ChainSafe/gossamer/lib/keystore" "github.com/ChainSafe/gossamer/lib/runtime" - "github.com/ChainSafe/gossamer/lib/scale" + "github.com/ChainSafe/gossamer/pkg/scale" "github.com/centrifuge/go-substrate-rpc-client/v2/signature" ctypes "github.com/centrifuge/go-substrate-rpc-client/v2/types" @@ -85,12 +85,13 @@ func createExtrinsics(t *testing.T, rt runtime.Instance, genHash common.Hash, no t.Helper() rawMeta, err := rt.Metadata() require.NoError(t, err) - - decoded, err := scale.Decode(rawMeta, []byte{}) + + var decoded []byte + err = scale.Unmarshal(rawMeta, &decoded) require.NoError(t, err) meta := &ctypes.Metadata{} - err = ctypes.DecodeFromBytes(decoded.([]byte), meta) + err = ctypes.DecodeFromBytes(decoded, meta) require.NoError(t, err) rv, err := rt.Version() From 2cfbdf52d2e3474fdf8eed69132b2e39da7c0c8f Mon Sep 17 00:00:00 2001 From: jimjbrettj Date: Mon, 5 Jul 2021 13:50:39 -0600 Subject: [PATCH 2/4] integrate scale into dot core --- dot/core/messages_test.go | 2 +- dot/core/service.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dot/core/messages_test.go b/dot/core/messages_test.go index 23411bea98..5f8f8785a8 100644 --- a/dot/core/messages_test.go +++ b/dot/core/messages_test.go @@ -85,7 +85,7 @@ func createExtrinsics(t *testing.T, rt runtime.Instance, genHash common.Hash, no t.Helper() rawMeta, err := rt.Metadata() require.NoError(t, err) - + var decoded []byte err = scale.Unmarshal(rawMeta, &decoded) require.NoError(t, err) diff --git a/dot/core/service.go b/dot/core/service.go index 8ee7d402f0..42761eeafb 100644 --- a/dot/core/service.go +++ b/dot/core/service.go @@ -31,7 +31,7 @@ import ( "github.com/ChainSafe/gossamer/lib/keystore" "github.com/ChainSafe/gossamer/lib/runtime" rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/lib/scale" + "github.com/ChainSafe/gossamer/pkg/scale" "github.com/ChainSafe/gossamer/lib/services" "github.com/ChainSafe/gossamer/lib/transaction" log "github.com/ChainSafe/log15" @@ -443,7 +443,7 @@ func (s *Service) handleChainReorg(prev, curr common.Hash) error { continue } - encExt, err := scale.Encode(ext) + encExt, err := scale.Marshal(ext) if err != nil { return err } From b170d62cede99a0fd49b4f73178f4dab0ddf3e9f Mon Sep 17 00:00:00 2001 From: jimjbrettj Date: Mon, 5 Jul 2021 14:14:05 -0600 Subject: [PATCH 3/4] integrate scale into dot/sync --- dot/sync/test_helpers.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dot/sync/test_helpers.go b/dot/sync/test_helpers.go index 4345afcb7f..b424b277c5 100644 --- a/dot/sync/test_helpers.go +++ b/dot/sync/test_helpers.go @@ -32,9 +32,9 @@ import ( "github.com/ChainSafe/gossamer/lib/runtime" rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/scale" "github.com/ChainSafe/gossamer/lib/transaction" "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/pkg/scale" log "github.com/ChainSafe/log15" "github.com/stretchr/testify/require" @@ -166,10 +166,11 @@ func BuildBlock(t *testing.T, instance runtime.Instance, parent *types.Header, e require.NoError(t, err) // decode inherent extrinsics - exts, err := scale.Decode(inherentExts, [][]byte{}) + var exts [][]byte + err = scale.Unmarshal(inherentExts, &exts) require.NoError(t, err) - inExt := exts.([][]byte) + inExt := exts var body *types.Body if ext != nil { @@ -191,7 +192,7 @@ func BuildBlock(t *testing.T, instance runtime.Instance, parent *types.Header, e // apply each inherent extrinsic for _, ext := range inExt { - in, err := scale.Encode(ext) //nolint + in, err := scale.Marshal(ext) //nolint require.NoError(t, err) ret, err := instance.ApplyExtrinsic(in) From 25999e336d9fbd84f299f7ce4db966df059891f1 Mon Sep 17 00:00:00 2001 From: jimjbrettj Date: Mon, 5 Jul 2021 14:27:28 -0600 Subject: [PATCH 4/4] integrate scale into sync and core --- dot/core/service.go | 2 +- dot/sync/test_helpers.go | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dot/core/service.go b/dot/core/service.go index 42761eeafb..0dabca67fd 100644 --- a/dot/core/service.go +++ b/dot/core/service.go @@ -31,9 +31,9 @@ import ( "github.com/ChainSafe/gossamer/lib/keystore" "github.com/ChainSafe/gossamer/lib/runtime" rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" - "github.com/ChainSafe/gossamer/pkg/scale" "github.com/ChainSafe/gossamer/lib/services" "github.com/ChainSafe/gossamer/lib/transaction" + "github.com/ChainSafe/gossamer/pkg/scale" log "github.com/ChainSafe/log15" ) diff --git a/dot/sync/test_helpers.go b/dot/sync/test_helpers.go index 4345afcb7f..b424b277c5 100644 --- a/dot/sync/test_helpers.go +++ b/dot/sync/test_helpers.go @@ -32,9 +32,9 @@ import ( "github.com/ChainSafe/gossamer/lib/runtime" rtstorage "github.com/ChainSafe/gossamer/lib/runtime/storage" "github.com/ChainSafe/gossamer/lib/runtime/wasmer" - "github.com/ChainSafe/gossamer/lib/scale" "github.com/ChainSafe/gossamer/lib/transaction" "github.com/ChainSafe/gossamer/lib/trie" + "github.com/ChainSafe/gossamer/pkg/scale" log "github.com/ChainSafe/log15" "github.com/stretchr/testify/require" @@ -166,10 +166,11 @@ func BuildBlock(t *testing.T, instance runtime.Instance, parent *types.Header, e require.NoError(t, err) // decode inherent extrinsics - exts, err := scale.Decode(inherentExts, [][]byte{}) + var exts [][]byte + err = scale.Unmarshal(inherentExts, &exts) require.NoError(t, err) - inExt := exts.([][]byte) + inExt := exts var body *types.Body if ext != nil { @@ -191,7 +192,7 @@ func BuildBlock(t *testing.T, instance runtime.Instance, parent *types.Header, e // apply each inherent extrinsic for _, ext := range inExt { - in, err := scale.Encode(ext) //nolint + in, err := scale.Marshal(ext) //nolint require.NoError(t, err) ret, err := instance.ApplyExtrinsic(in)