Skip to content

Commit

Permalink
Revert 7242: Opt out --use-check-point-cache (#7338)
Browse files Browse the repository at this point in the history
* revert bb37436
  • Loading branch information
terencechain authored Sep 24, 2020
1 parent 5b81400 commit ff69375
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
7 changes: 3 additions & 4 deletions shared/featureconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,9 @@ func ConfigureBeaconChain(ctx *cli.Context) {
log.Warn("Enabling peer scoring in P2P")
cfg.EnablePeerScorer = true
}
cfg.UseCheckPointInfoCache = true
if ctx.Bool(disableCheckPtInfoCache.Name) {
log.Warn("Disabling advanced check point info cache")
cfg.UseCheckPointInfoCache = false
if ctx.Bool(checkPtInfoCache.Name) {
log.Warn("Using advance check point info cache")
cfg.UseCheckPointInfoCache = true
}
if ctx.Bool(enableBlst.Name) {
log.Warn("Enabling new BLS library blst")
Expand Down
15 changes: 5 additions & 10 deletions shared/featureconfig/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,15 @@ var (
Name: "enable-peer-scorer",
Usage: "Enable experimental P2P peer scorer",
}
disableCheckPtInfoCache = &cli.BoolFlag{
Name: "disable-check-point-cache",
Usage: "Disables check point info caching",
checkPtInfoCache = &cli.BoolFlag{
Name: "use-check-point-cache",
Usage: "Enables check point info caching",
}
)

// devModeFlags holds list of flags that are set when development mode is on.
var devModeFlags = []cli.Flag{
checkPtInfoCache,
enableEth1DataMajorityVote,
enableAttBroadcastDiscoveryAttempts,
enablePeerScorer,
Expand Down Expand Up @@ -553,11 +554,6 @@ var (
Usage: deprecatedUsage,
Hidden: true,
}
deprecatedCheckptInfoCache = &cli.BoolFlag{
Name: "use-check-point-cache",
Usage: deprecatedUsage,
Hidden: true,
}
deprecatedBatchBlockVerify = &cli.BoolFlag{
Name: "batch-block-verify",
Usage: deprecatedUsage,
Expand Down Expand Up @@ -644,7 +640,6 @@ var deprecatedFlags = []cli.Flag{
deprecatedSlasherProviderFlag,
deprecatedEnableSlasherFlag,
deprecatedEnableFinalizedDepositsCache,
deprecatedCheckptInfoCache,
deprecatedBatchBlockVerify,
deprecatedEnableRoughtime,
}
Expand Down Expand Up @@ -706,7 +701,7 @@ var BeaconChainFlags = append(deprecatedFlags, []cli.Flag{
enableEth1DataMajorityVote,
enableAttBroadcastDiscoveryAttempts,
enablePeerScorer,
disableCheckPtInfoCache,
checkPtInfoCache,
}...)

// E2EBeaconChainFlags contains a list of the beacon chain feature flags to be tested in E2E.
Expand Down

0 comments on commit ff69375

Please sign in to comment.