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

Remove Old Sync Routine #5761

Merged
merged 1 commit into from
May 6, 2020
Merged

Remove Old Sync Routine #5761

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion beacon-chain/node/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ go_library(
"//beacon-chain/state/stategen:go_default_library",
"//beacon-chain/sync:go_default_library",
"//beacon-chain/sync/initial-sync:go_default_library",
"//beacon-chain/sync/initial-sync-old:go_default_library",
"//shared:go_default_library",
"//shared/cmd:go_default_library",
"//shared/debug:go_default_library",
Expand Down
44 changes: 6 additions & 38 deletions beacon-chain/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import (
"github.com/prysmaticlabs/prysm/beacon-chain/state/stategen"
prysmsync "github.com/prysmaticlabs/prysm/beacon-chain/sync"
initialsync "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync"
initialsyncold "github.com/prysmaticlabs/prysm/beacon-chain/sync/initial-sync-old"
"github.com/prysmaticlabs/prysm/shared"
"github.com/prysmaticlabs/prysm/shared/cmd"
"github.com/prysmaticlabs/prysm/shared/debug"
Expand Down Expand Up @@ -434,19 +433,9 @@ func (b *BeaconNode) registerSyncService() error {
return err
}

var initSync prysmsync.Checker
if cfg := featureconfig.Get(); cfg.DisableInitSyncQueue {
var initSyncTmp *initialsyncold.Service
if err := b.services.FetchService(&initSyncTmp); err != nil {
return err
}
initSync = initSyncTmp
} else {
var initSyncTmp *initialsync.Service
if err := b.services.FetchService(&initSyncTmp); err != nil {
return err
}
initSync = initSyncTmp
var initSync *initialsync.Service
if err := b.services.FetchService(&initSync); err != nil {
return err
}

rs := prysmsync.NewRegularSync(&prysmsync.Config{
Expand All @@ -473,17 +462,6 @@ func (b *BeaconNode) registerInitialSyncService() error {
return err
}

if cfg := featureconfig.Get(); cfg.DisableInitSyncQueue {
is := initialsyncold.NewInitialSync(&initialsyncold.Config{
DB: b.db,
Chain: chainService,
P2P: b.fetchP2P(),
StateNotifier: b,
BlockNotifier: b,
})
return b.services.RegisterService(is)
}

is := initialsync.NewInitialSync(&initialsync.Config{
DB: b.db,
Chain: chainService,
Expand All @@ -505,19 +483,9 @@ func (b *BeaconNode) registerRPCService() error {
return err
}

var syncService prysmsync.Checker
if cfg := featureconfig.Get(); cfg.DisableInitSyncQueue {
var initSyncTmp *initialsyncold.Service
if err := b.services.FetchService(&initSyncTmp); err != nil {
return err
}
syncService = initSyncTmp
} else {
var initSyncTmp *initialsync.Service
if err := b.services.FetchService(&initSyncTmp); err != nil {
return err
}
syncService = initSyncTmp
var syncService *initialsync.Service
if err := b.services.FetchService(&syncService); err != nil {
return err
}

genesisValidators := b.cliCtx.Uint64(flags.InteropNumValidatorsFlag.Name)
Expand Down
66 changes: 0 additions & 66 deletions beacon-chain/sync/initial-sync-old/BUILD.bazel
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions beacon-chain/sync/initial-sync-old/log.go
View file
Open in desktop

This file was deleted.