Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore (pkg/scale) scale babe integration #1670

Merged
merged 11 commits into from
Jul 6, 2021
Merged

chore (pkg/scale) scale babe integration #1670

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7caf8d4
integrate scale into babe library
jimjbrettj Jul 1, 2021
197a7cf
use results for unmarshalling
jimjbrettj Jul 2, 2021
fa33327
clean up code
jimjbrettj Jul 2, 2021
07bdba2
fix switch to pass checks
jimjbrettj Jul 2, 2021
b170d62
integrate scale into dot/sync
jimjbrettj Jul 5, 2021
295eda3
cr feedback
jimjbrettj Jul 5, 2021
aef1240
Merge branch 'development' into babeScaleIntegration
jimjbrettj Jul 5, 2021
87fa1f7
Merge branch 'development' of github.com:ChainSafe/gossamer into deve…
jimjbrettj Jul 5, 2021
4230d5b
merge
jimjbrettj Jul 5, 2021
3f02bf3
merge
jimjbrettj Jul 5, 2021
427eb8e
Merge branch 'development' into babeScaleIntegration
noot Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions dot/sync/test_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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 {
Expand All @@ -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)
Expand Down
23 changes: 15 additions & 8 deletions lib/babe/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/ChainSafe/gossamer/dot/types"
"github.com/ChainSafe/gossamer/lib/common"
"github.com/ChainSafe/gossamer/lib/runtime"
"github.com/ChainSafe/gossamer/lib/scale"
"github.com/ChainSafe/gossamer/lib/transaction"
"github.com/ChainSafe/gossamer/pkg/scale"
)

const (
Expand Down Expand Up @@ -305,14 +305,15 @@ func (b *BlockBuilder) buildBlockInherents(slot Slot) ([][]byte, error) {
}

// decode inherent extrinsics
exts, err := scale.Decode(inherentExts, [][]byte{})
var exts [][]byte
err = scale.Unmarshal(inherentExts, &exts)
if err != nil {
return nil, err
}

// apply each inherent extrinsic
for _, ext := range exts.([][]byte) {
in, err := scale.Encode(ext)
for _, ext := range exts {
in, err := scale.Marshal(ext)
if err != nil {
return nil, err
}
Expand All @@ -328,7 +329,7 @@ func (b *BlockBuilder) buildBlockInherents(slot Slot) ([][]byte, error) {
}
}

return exts.([][]byte), nil
return exts, nil
}

func (b *BlockBuilder) addToQueue(txs []*transaction.ValidTransaction) {
Expand All @@ -352,12 +353,18 @@ func ExtrinsicsToBody(inherents [][]byte, txs []*transaction.ValidTransaction) (
extrinsics := types.BytesArrayToExtrinsics(inherents)

for _, tx := range txs {
decExt, err := scale.Decode(tx.Extrinsic, []byte{})
var decExt []byte
err := scale.Unmarshal(tx.Extrinsic, &decExt)
if err != nil {
return nil, err
}
extrinsics = append(extrinsics, decExt.([]byte))
extrinsics = append(extrinsics, decExt)
}

return types.NewBodyFromExtrinsics(extrinsics)
enc, err := scale.Marshal(extrinsics)
if err != nil {
return nil, err
}
body := types.Body(enc)
return &body, nil
}
13 changes: 8 additions & 5 deletions lib/babe/build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/ChainSafe/gossamer/lib/common"
"github.com/ChainSafe/gossamer/lib/crypto/sr25519"
"github.com/ChainSafe/gossamer/lib/runtime"
"github.com/ChainSafe/gossamer/lib/scale"
"github.com/ChainSafe/gossamer/lib/transaction"
"github.com/ChainSafe/gossamer/pkg/scale"

log "github.com/ChainSafe/log15"
cscale "github.com/centrifuge/go-substrate-rpc-client/v3/scale"
Expand Down Expand Up @@ -90,11 +90,13 @@ func createTestExtrinsic(t *testing.T, rt runtime.Instance, genHash common.Hash,
rawMeta, err := rt.Metadata()
require.NoError(t, err)

decoded, err := scale.Decode(rawMeta, []byte{})
//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()
Expand Down Expand Up @@ -313,11 +315,12 @@ func TestBuildAndApplyExtrinsic(t *testing.T) {
// build extrinsic
rawMeta, err := babeService.rt.Metadata()
require.NoError(t, err)
decoded, err := scale.Decode(rawMeta, []byte{})
var decoded []byte
err = scale.Unmarshal(rawMeta, []byte{})
require.NoError(t, err)

meta := &ctypes.Metadata{}
err = ctypes.DecodeFromBytes(decoded.([]byte), meta)
err = ctypes.DecodeFromBytes(decoded, meta)
require.NoError(t, err)

rv, err := babeService.rt.Version()
Expand Down
Loading