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.

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

Get the value of major syncing from sync package for network bridge #4260

Merged
merged 7 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions dot/mock_node_builder_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions dot/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ type nodeBuilderIface interface {
createGRANDPAService(config *cfg.Config, st *state.Service, ks KeyStore,
net *network.Service, telemetryMailer Telemetry) (*grandpa.Service, error)
createParachainHostService(net *network.Service, forkID string, st *state.Service, ks keystore.Keystore,
) (*parachain.Service, error)
syncer *dotsync.Service) (*parachain.Service, error)
newSyncService(config *cfg.Config, st *state.Service, finalityGadget BlockJustificationVerifier,
verifier *babe.VerificationManager, cs *core.Service, net *network.Service,
telemetryMailer Telemetry) (*dotsync.Service, error)
Expand Down Expand Up @@ -376,12 +376,6 @@ func newNode(config *cfg.Config,
}
nodeSrvcs = append(nodeSrvcs, fg)

phs, err := builder.createParachainHostService(networkSrvc, gd.ForkID, stateSrvc, ks.Para)
if err != nil {
return nil, err
}
nodeSrvcs = append(nodeSrvcs, phs)

syncer, err := builder.newSyncService(config, stateSrvc, fg, ver, coreSrvc, networkSrvc, telemetryMailer)
if err != nil {
return nil, err
Expand All @@ -393,6 +387,12 @@ func newNode(config *cfg.Config,
}
nodeSrvcs = append(nodeSrvcs, syncer)

phs, err := builder.createParachainHostService(networkSrvc, gd.ForkID, stateSrvc, ks.Para, syncer)
if err != nil {
return nil, err
}
nodeSrvcs = append(nodeSrvcs, phs)

bp, err := builder.createBABEService(config, stateSrvc, ks.Babe, coreSrvc, telemetryMailer)
if err != nil {
return nil, err
Expand Down
3 changes: 2 additions & 1 deletion dot/node_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ func TestNewNode(t *testing.T) {
mockStateService := &state.Service{
Block: mockBlockState,
}
phs, err := parachain.NewService(testNetworkService, "random_fork_id", mockStateService, ks.Para)
phs, err := parachain.NewService(testNetworkService, "random_fork_id", mockStateService, ks.Para, &dotsync.Service{})
require.NoError(t, err)

m.EXPECT().createRuntimeStorage(gomock.AssignableToTypeOf(&state.Service{})).Return(&runtime.
Expand Down Expand Up @@ -183,6 +183,7 @@ func TestNewNode(t *testing.T) {
gomock.AssignableToTypeOf("random_fork_id"),
gomock.AssignableToTypeOf(mockStateService),
gomock.AssignableToTypeOf(ks.Para),
gomock.AssignableToTypeOf(&dotsync.Service{}),
).Return(phs, nil)

got, err := newNode(initConfig, ks, m, mockServiceRegistry)
Expand Down
39 changes: 0 additions & 39 deletions dot/parachain/collator-protocol/mocks_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 9 additions & 7 deletions dot/parachain/network-bridge/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"sort"

"github.com/ChainSafe/gossamer/dot/network"

collatorprotocolmessages "github.com/ChainSafe/gossamer/dot/parachain/collator-protocol/messages"
events "github.com/ChainSafe/gossamer/dot/parachain/network-bridge/events"
networkbridgemessages "github.com/ChainSafe/gossamer/dot/parachain/network-bridge/messages"
Expand Down Expand Up @@ -43,6 +44,7 @@ type NetworkBridgeReceiver struct {

BlockState *state.BlockState
Keystore keystore.Keystore
sync Sync
kishansagathiya marked this conversation as resolved.
Show resolved Hide resolved

localView *View

Expand Down Expand Up @@ -95,11 +97,12 @@ type ProspectiveCandidate struct {
}

func RegisterReceiver(overseerChan chan<- any, net Network,
collationProtocolID protocol.ID, validationProtocolID protocol.ID) (*NetworkBridgeReceiver, error) {
collationProtocolID protocol.ID, validationProtocolID protocol.ID, syncer Sync) (*NetworkBridgeReceiver, error) {
nbr := &NetworkBridgeReceiver{
net: net,
SubsystemsToOverseer: overseerChan,
networkEventInfoChan: net.GetNetworkEventsChannel(),
sync: syncer,
}

err := RegisterCollationProtocol(net, *nbr, collationProtocolID, overseerChan)
Expand Down Expand Up @@ -156,11 +159,6 @@ func (nbr *NetworkBridgeReceiver) Name() parachaintypes.SubSystemName {
func (nbr *NetworkBridgeReceiver) ProcessActiveLeavesUpdateSignal(
signal parachaintypes.ActiveLeavesUpdateSignal) error {

// TODO: #4207 get the value for majorSyncing for syncing package
// majorSyncing means you are 5 blocks behind the tip of the chain and thus more aggressively
// download blocks etc to reach the tip of the chain faster.
var majorSyncing bool

nbr.liveHeads = append(nbr.liveHeads, parachaintypes.ActivatedLeaf{
Hash: signal.Activated.Hash,
Number: signal.Activated.Number,
Expand All @@ -177,7 +175,7 @@ func (nbr *NetworkBridgeReceiver) ProcessActiveLeavesUpdateSignal(
sort.Sort(SortableActivatedLeaves(newLiveHeads))
nbr.liveHeads = newLiveHeads

if !majorSyncing {
if nbr.sync.IsSynced() {
// update our view
err := nbr.updateOurView()
if err != nil {
Expand Down Expand Up @@ -414,3 +412,7 @@ func getTopologyPeers(authorityDiscoveryService AuthorityDiscoveryService,
type AuthorityDiscoveryService interface {
GetPeerIDByAuthorityID(authorityID parachaintypes.AuthorityDiscoveryID) peer.ID
}

type Sync interface {
IsSynced() bool
}
46 changes: 46 additions & 0 deletions dot/parachain/overseer/mock_runtime_instance_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions dot/parachain/overseer/mocks_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion dot/parachain/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type Service struct {

var logger = log.NewFromGlobal(log.AddContext("pkg", "parachain"))

func NewService(net Network, forkID string, st *state.Service, ks keystore.Keystore) (*Service, error) {
func NewService(net Network, forkID string, st *state.Service, ks keystore.Keystore, syncer Sync) (*Service, error) {
overseer := overseer.NewOverseer(st.Block)
err := overseer.Start()
if err != nil {
Expand All @@ -61,6 +61,7 @@ func NewService(net Network, forkID string, st *state.Service, ks keystore.Keyst
net,
protocol.ID(collationProtocolID),
protocol.ID(validationProtocolID),
syncer,
)
if err != nil {
return nil, fmt.Errorf("registering network bridge receiver: %w", err)
Expand Down Expand Up @@ -169,3 +170,7 @@ type Network interface {
GetNetworkEventsChannel() chan *network.NetworkEventInfo
FreeNetworkEventsChannel(ch chan *network.NetworkEventInfo)
}

type Sync interface {
IsSynced() bool
}
4 changes: 2 additions & 2 deletions dot/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,8 @@ func (nodeBuilder) createGRANDPAService(config *cfg.Config, st *state.Service, k
}

func (nodeBuilder) createParachainHostService(net *network.Service, forkID string, st *state.Service,
ks keystore.Keystore) (*parachain.Service, error) {
return parachain.NewService(net, forkID, st, ks)
ks keystore.Keystore, syncer *sync.Service) (*parachain.Service, error) {
return parachain.NewService(net, forkID, st, ks, syncer)
}

func (nodeBuilder) createBlockVerifier(st *state.Service) *babe.VerificationManager {
Expand Down
Loading