Skip to content

feat(dot/types): moves ParachainInherentData type to types package #3048

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

Closed
EclesioMeloJunior wants to merge 1 commit into from
Closed

feat(dot/types): moves ParachainInherentData type to types package #3048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions lib/babe/parachain_inherents.go → dot/types/parachain_inherents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// Copyright 2022 ChainSafe Systems (ON)
// SPDX-License-Identifier: LGPL-3.0-only

package babe
package types

import (
"fmt"

"github.com/ChainSafe/gossamer/dot/types"
"github.com/ChainSafe/gossamer/lib/common"
"github.com/ChainSafe/gossamer/pkg/scale"
)
Expand Down Expand Up @@ -379,5 +378,5 @@ type ParachainInherentData struct {
// Sets of dispute votes for inclusion,
Disputes multiDisputeStatementSet `scale:"3"`
// The parent block header. Used for checking state proofs.
ParentHeader types.Header `scale:"4"`
ParentHeader Header `scale:"4"`
}
10 changes: 4 additions & 6 deletions lib/babe/parachain_inherents_test.go → dot/types/parachain_inherents_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// Copyright 2022 ChainSafe Systems (ON)
// SPDX-License-Identifier: LGPL-3.0-only

package babe
package types

import (
"testing"

"github.com/ChainSafe/gossamer/dot/types"
"github.com/ChainSafe/gossamer/lib/common"
"github.com/ChainSafe/gossamer/pkg/scale"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -276,9 +275,8 @@ func TestParachainInherents(t *testing.T) {
// let mut inherents: sp_inherents::InherentData = sp_inherents::InherentData::new();
// inherents.put_data(*b"parachn0", &para_int).unwrap();
// println!("{:?}", inherents.encode());

parachainInherent := ParachainInherentData{
ParentHeader: types.Header{
ParentHeader: Header{
ParentHash: common.MustBlake2bHash([]byte("1000")),
Number: uint(2000),
StateRoot: common.MustBlake2bHash([]byte("3000")),
Expand All @@ -291,8 +289,8 @@ func TestParachainInherents(t *testing.T) {

assert.Equal(t, expectedParaInherentsbytes, actualParaInherentBytes)

idata := types.NewInherentData()
err = idata.SetInherent(types.Parachn0, parachainInherent)
idata := NewInherentData()
err = idata.SetInherent(Parachn0, parachainInherent)
require.NoError(t, err)

actualInherentsBytes, err := idata.Encode()
Expand Down
2 changes: 1 addition & 1 deletion lib/babe/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func buildBlockInherents(slot Slot, rt ExtrinsicHandler, parent *types.Header) (
return nil, err
}

parachainInherent := ParachainInherentData{
parachainInherent := types.ParachainInherentData{
ParentHeader: *parent,
}

Expand Down