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) integrate scale into dot/core and dot/sync #1676

Merged
merged 10 commits into from
Jul 8, 2021
+6 −5
Merged

chore (pkg/scale) integrate scale into dot/core and dot/sync #1676

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e263af0
scale into messages_test
jimjbrettj Jul 5, 2021
2cfbdf5
integrate scale into dot core
jimjbrettj Jul 5, 2021
b170d62
integrate scale into dot/sync
jimjbrettj Jul 5, 2021
25999e3
integrate scale into sync and core
jimjbrettj Jul 5, 2021
87fa1f7
Merge branch 'development' of github.com:ChainSafe/gossamer into deve…
jimjbrettj Jul 5, 2021
2f4bc48
resolve merge conflicts
jimjbrettj Jul 5, 2021
444d660
Merge branch 'development' into jimmy/integrateScaleCoreAndSync
jimjbrettj Jul 6, 2021
9b371d3
Merge branch 'development' into jimmy/integrateScaleCoreAndSync
noot Jul 7, 2021
1f1909c
Merge branch 'development' into jimmy/integrateScaleCoreAndSync
jimjbrettj Jul 7, 2021
dbfa717
Merge branch 'development' into jimmy/integrateScaleCoreAndSync
jimjbrettj Jul 8, 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
7 changes: 4 additions & 3 deletions dot/core/messages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/v3/signature"
ctypes "github.com/centrifuge/go-substrate-rpc-client/v3/types"
Expand All @@ -42,11 +42,12 @@ func createExtrinsic(t *testing.T, rt runtime.Instance, genHash common.Hash, non
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()
Expand Down
4 changes: 2 additions & 2 deletions dot/core/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/lib/scale"
"github.com/ChainSafe/gossamer/lib/services"
"github.com/ChainSafe/gossamer/lib/transaction"
"github.com/ChainSafe/gossamer/pkg/scale"
log "github.com/ChainSafe/log15"
)

Expand Down Expand Up @@ -431,7 +431,7 @@ func (s *Service) handleChainReorg(prev, curr common.Hash) error {
// currently we are attempting to re-add inherents, causing lots of "'Bad input data provided to validate_transaction" errors.
for _, ext := range exts {
logger.Debug("validating transaction on re-org chain", "extrinsic", ext)
encExt, err := scale.Encode(ext)
encExt, err := scale.Marshal(ext)
if err != nil {
return err
}
Expand Down