Skip to content

Commit

Permalink
Invert enable-pruning-deposit-proofs (#7565)
Browse files Browse the repository at this point in the history
Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
  • Loading branch information
rkapka and prylabs-bulldozer[bot] committed Oct 19, 2020
1 parent ab40a11 commit 88b2a4c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
7 changes: 4 additions & 3 deletions shared/featureconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,10 @@ func ConfigureBeaconChain(ctx *cli.Context) {
log.Warn("Enabling new BLS library blst")
cfg.EnableBlst = true
}
if ctx.Bool(enablePruningDepositProofs.Name) {
log.Warn("Enabling pruning deposit proofs")
cfg.EnablePruningDepositProofs = true
cfg.EnablePruningDepositProofs = true
if ctx.Bool(disablePruningDepositProofs.Name) {
log.Warn("Disabling pruning deposit proofs")
cfg.EnablePruningDepositProofs = false
}
Init(cfg)
}
Expand Down
6 changes: 6 additions & 0 deletions shared/featureconfig/deprecated_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,14 @@ var (
Usage: deprecatedUsage,
Hidden: true,
}
deprecatedEnablePruningDepositProofs = &cli.BoolFlag{
Name: "enable-pruning-deposit-proofs",
Usage: deprecatedUsage,
Hidden: true,
}
)

var deprecatedFlags = []cli.Flag{
exampleDeprecatedFeatureFlag,
deprecatedEnablePruningDepositProofs,
}
11 changes: 5 additions & 6 deletions shared/featureconfig/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@ var (
Name: "use-check-point-cache",
Usage: "Enables check point info caching",
}
enablePruningDepositProofs = &cli.BoolFlag{
Name: "enable-pruning-deposit-proofs",
Usage: "Enables pruning deposit proofs when they are no longer needed. This significantly reduces deposit size.",
disablePruningDepositProofs = &cli.BoolFlag{
Name: "disable-pruning-deposit-proofs",
Usage: "Disables pruning deposit proofs when they are no longer needed." +
"This will probably significantly increase the amount of memory taken up by deposits.",
}
)

Expand All @@ -103,7 +104,6 @@ var devModeFlags = []cli.Flag{
enableEth1DataMajorityVote,
enableAttBroadcastDiscoveryAttempts,
enablePeerScorer,
enablePruningDepositProofs,
}

// ValidatorFlags contains a list of all the feature flags that apply to the validator client.
Expand Down Expand Up @@ -153,7 +153,7 @@ var BeaconChainFlags = append(deprecatedFlags, []cli.Flag{
enableAttBroadcastDiscoveryAttempts,
enablePeerScorer,
checkPtInfoCache,
enablePruningDepositProofs,
disablePruningDepositProofs,
}...)

// E2EBeaconChainFlags contains a list of the beacon chain feature flags to be tested in E2E.
Expand All @@ -162,5 +162,4 @@ var E2EBeaconChainFlags = []string{
"--dev",
"--enable-eth1-data-majority-vote",
"--use-check-point-cache",
"--enable-pruning-deposit-proofs",
}

0 comments on commit 88b2a4c

Please sign in to comment.