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

Jump to bottom

chore (pkg/scale) integrate scale pkg into dot/rpc #1678

Merged
merged 10 commits into from
Jul 8, 2021
Merged

chore (pkg/scale) integrate scale pkg into dot/rpc #1678

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
b170d62
integrate scale into dot/sync
jimjbrettj Jul 5, 2021
87fa1f7
Merge branch 'development' of github.com:ChainSafe/gossamer into deve…
jimjbrettj Jul 5, 2021
e0b1b87
integrate scale into dot/rpc
jimjbrettj Jul 6, 2021
2bea2d7
scale into epoch
jimjbrettj Jul 6, 2021
1c37e61
integrate scale into pruner
jimjbrettj Jul 6, 2021
a2c85c0
integrate scale pkg into dot/state
jimjbrettj Jul 6, 2021
d396bc6
WIP/Fix digest encoding errors
jimjbrettj Jul 6, 2021
2e4c640
resolve merge conflicts
jimjbrettj Jul 7, 2021
e4e92f9
remove changes in dot/state to include in separate PR
jimjbrettj Jul 7, 2021
4fa855c
resolve merge conflicts
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/rpc/modules/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}

Expand Down
7 changes: 4 additions & 3 deletions dot/rpc/modules/system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions dot/rpc/modules/system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (
"github.com/ChainSafe/gossamer/lib/keystore"
"github.com/ChainSafe/gossamer/lib/runtime"
"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 @@ -308,7 +308,7 @@ func setupSystemModule(t *testing.T) *SystemModule {
FreeFrozen common.Uint128
}{},
}
aliceAcctEncoded, err := scale.Encode(aliceAcctInfo)
aliceAcctEncoded, err := scale.Marshal(aliceAcctInfo)
require.NoError(t, err)
ts.Set(aliceAcctStoKey, aliceAcctEncoded)

Expand Down