forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

revert some changes

Browse source
This commit is contained in:
Arpit Temani 2022-11-22 12:20:57 +05:30
parent a4a39a4dd9
commit be58978cdc
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmd/utils/flags.go
View file

@ -250,13 +250,13 @@ var (
Name: "lightkdf", Name: "lightkdf",
Usage: "Reduce key-derivation RAM & CPU usage at some expense of KDF strength", Usage: "Reduce key-derivation RAM & CPU usage at some expense of KDF strength",
} }
EthRequiredBlocksFlag = cli.StringFlag{ EthPeerRequiredBlocksFlag = cli.StringFlag{
Name: "eth.requiredblocks", Name: "eth.requiredblocks",
Usage: "Comma separated block number-to-hash mappings to require for peering (<number>=<hash>)", Usage: "Comma separated block number-to-hash mappings to require for peering (<number>=<hash>)",
} }
LegacyWhitelistFlag = cli.StringFlag{ LegacyWhitelistFlag = cli.StringFlag{
Name: "whitelist", Name: "whitelist",
Usage: "Comma separated block number-to-hash mappings to enforce (<number>=<hash>) (deprecated in favor of --eth.requiredblocks)", Usage: "Comma separated block number-to-hash mappings to enforce (<number>=<hash>) (deprecated in favor of --peer.requiredblocks)",
} }
BloomFilterSizeFlag = cli.Uint64Flag{ BloomFilterSizeFlag = cli.Uint64Flag{
Name: "bloomfilter.size", Name: "bloomfilter.size",
@ -1499,20 +1499,20 @@ func setMiner(ctx *cli.Context, cfg *miner.Config) {
} }
} }
func setRequiredBlocks(ctx *cli.Context, cfg *ethconfig.Config) { func setPeerRequiredBlocks(ctx *cli.Context, cfg *ethconfig.Config) {
requiredBlocks := ctx.GlobalString(EthRequiredBlocksFlag.Name) peerRequiredBlocks := ctx.GlobalString(EthPeerRequiredBlocksFlag.Name)
if requiredBlocks == "" { if peerRequiredBlocks == "" {
if ctx.GlobalIsSet(LegacyWhitelistFlag.Name) { if ctx.GlobalIsSet(LegacyWhitelistFlag.Name) {
log.Warn("The flag --whitelist is deprecated and will be removed, please use --eth.requiredblocks") log.Warn("The flag --whitelist is deprecated and will be removed, please use --eth.requiredblocks")
requiredBlocks = ctx.GlobalString(LegacyWhitelistFlag.Name) peerRequiredBlocks = ctx.GlobalString(LegacyWhitelistFlag.Name)
} else { } else {
return return
} }
} }
cfg.PeerRequiredBlocks = make(map[uint64]common.Hash) cfg.PeerRequiredBlocks = make(map[uint64]common.Hash)
for _, entry := range strings.Split(requiredBlocks, ",") { for _, entry := range strings.Split(peerRequiredBlocks, ",") {
parts := strings.Split(entry, "=") parts := strings.Split(entry, "=")
if len(parts) != 2 { if len(parts) != 2 {
Fatalf("Invalid required block entry: %s", entry) Fatalf("Invalid required block entry: %s", entry)
@ -1592,7 +1592,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
setTxPool(ctx, &cfg.TxPool) setTxPool(ctx, &cfg.TxPool)
setEthash(ctx, cfg) setEthash(ctx, cfg)
setMiner(ctx, &cfg.Miner) setMiner(ctx, &cfg.Miner)
setRequiredBlocks(ctx, cfg) setPeerRequiredBlocks(ctx, cfg)
setLes(ctx, cfg) setLes(ctx, cfg)
if ctx.GlobalIsSet(BorLogsFlag.Name) { if ctx.GlobalIsSet(BorLogsFlag.Name) {