status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-01-09 13:56:23 +00:00
Code Issues Projects Releases Wiki Activity

remove --subscribe-all{att,sync}nets (#3359)

Browse Source
This commit is contained in:
tersec 2022-02-04 12:34:03 +00:00 committed by GitHub
parent 02349b4181
commit e0fb5d95a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
beacon_chain/conf.nim
View File

@ -160,19 +160,9 @@ type
desc: "Node agent string which is used as identifier in network" desc: "Node agent string which is used as identifier in network"
name: "agent-string" }: string name: "agent-string" }: string
subscribeAllAttnets* {.
defaultValue: false,
desc: "Subscribe to all attestation subnet topics when gossiping"
name: "subscribe-all-attnets" }: bool
subscribeAllSyncnets* {.
defaultValue: false,
desc: "Subscribe to all sync subnet topics when gossiping"
name: "subscribe-all-syncnets" }: bool
subscribeAllSubnets* {. subscribeAllSubnets* {.
defaultValue: false, defaultValue: false,
desc: "Subscribe to all subnet topics when gossiping; implies subscribe-all-attnets and subscribe-all-syncnets" desc: "Subscribe to all subnet topics when gossiping"
name: "subscribe-all-subnets" }: bool name: "subscribe-all-subnets" }: bool
slashingDbKind* {. slashingDbKind* {.
@ -262,7 +252,8 @@ type
name: "graffiti" }: Option[GraffitiBytes] name: "graffiti" }: Option[GraffitiBytes]
verifyFinalization* {. verifyFinalization* {.
desc: "Specify whether to verify finalization occurs on schedule, for testing" hidden
desc: "Specify whether to verify finalization occurs on schedule (debug only)"
defaultValue: false defaultValue: false
name: "verify-finalization" }: bool name: "verify-finalization" }: bool

5
beacon_chain/nimbus_beacon_node.nim
View File

@ -543,8 +543,7 @@ proc init*(T: type BeaconNode,
requestManager: RequestManager.init(network, blockVerifier), requestManager: RequestManager.init(network, blockVerifier),
syncManager: syncManager, syncManager: syncManager,
backfiller: backfiller, backfiller: backfiller,
actionTracker: ActionTracker.init( actionTracker: ActionTracker.init(rng, config.subscribeAllSubnets),
rng, config.subscribeAllAttnets or config.subscribeAllSubnets),
processor: processor, processor: processor,
blockProcessor: blockProcessor, blockProcessor: blockProcessor,
consensusManager: consensusManager, consensusManager: consensusManager,
@ -725,7 +724,7 @@ proc removePhase0MessageHandlers(node: BeaconNode, forkDigest: ForkDigest) =
func hasSyncPubKey(node: BeaconNode, epoch: Epoch): auto = func hasSyncPubKey(node: BeaconNode, epoch: Epoch): auto =
# Only used to determine which gossip topics to which to subscribe # Only used to determine which gossip topics to which to subscribe
if node.config.subscribeAllSubnets or node.config.subscribeAllSyncnets: if node.config.subscribeAllSubnets:
(func(pubkey: ValidatorPubKey): bool {.closure.} = true) (func(pubkey: ValidatorPubKey): bool {.closure.} = true)
else: else:
(func(pubkey: ValidatorPubKey): bool = (func(pubkey: ValidatorPubKey): bool =