From b0cccae7f4d78ee2dbdd4ebe087d6ab1bdb963f0 Mon Sep 17 00:00:00 2001 From: Etan Kissling Date: Sat, 11 Mar 2023 15:39:29 +0100 Subject: [PATCH] rename `(with|at)StateFork` > `(with|at)ConsensusFork` (#4725) --- beacon_chain/light_client.nim | 6 +++--- beacon_chain/nimbus_beacon_node.nim | 8 ++++---- beacon_chain/nimbus_light_client.nim | 4 ++-- beacon_chain/rpc/rest_light_client_api.nim | 2 +- beacon_chain/spec/forks.nim | 6 +++--- .../test_fixture_light_client_single_merkle_proof.nim | 2 +- .../test_fixture_light_client_update_ranking.nim | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/beacon_chain/light_client.nim b/beacon_chain/light_client.nim index 6bffb7fd9..1267fb2e2 100644 --- a/beacon_chain/light_client.nim +++ b/beacon_chain/light_client.nim @@ -348,7 +348,7 @@ proc installMessageValidators*( when lcDataFork > LightClientDataFork.None: let contextFork = consensusFork # Avoid capturing `Deneb` (Nim 1.6) - digest = forkDigests[].atStateFork(contextFork) + digest = forkDigests[].atConsensusFork(contextFork) lightClient.network.addValidator( getLightClientFinalityUpdateTopic(digest), @@ -413,7 +413,7 @@ proc updateGossipStatus*( for gossipFork in oldGossipForks: if gossipFork >= ConsensusFork.Altair: - let forkDigest = lightClient.forkDigests[].atStateFork(gossipFork) + let forkDigest = lightClient.forkDigests[].atConsensusFork(gossipFork) lightClient.network.unsubscribe( getLightClientFinalityUpdateTopic(forkDigest)) lightClient.network.unsubscribe( @@ -421,7 +421,7 @@ proc updateGossipStatus*( for gossipFork in newGossipForks: if gossipFork >= ConsensusFork.Altair: - let forkDigest = lightClient.forkDigests[].atStateFork(gossipFork) + let forkDigest = lightClient.forkDigests[].atConsensusFork(gossipFork) lightClient.network.subscribe( getLightClientFinalityUpdateTopic(forkDigest), basicParams) diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim index 89594053f..e57201130 100644 --- a/beacon_chain/nimbus_beacon_node.nim +++ b/beacon_chain/nimbus_beacon_node.nim @@ -160,7 +160,7 @@ proc loadChainDag( RestVersioned[ForkedLightClientFinalityUpdate]( data: data, jsonVersion: contextFork, - sszContext: dag.forkDigests[].atStateFork(contextFork))) + sszContext: dag.forkDigests[].atConsensusFork(contextFork))) proc onLightClientOptimisticUpdate(data: ForkedLightClientOptimisticUpdate) = if dag == nil: return withForkyOptimisticUpdate(data): @@ -171,7 +171,7 @@ proc loadChainDag( RestVersioned[ForkedLightClientOptimisticUpdate]( data: data, jsonVersion: contextFork, - sszContext: dag.forkDigests[].atStateFork(contextFork))) + sszContext: dag.forkDigests[].atConsensusFork(contextFork))) var extraFlags = {enableTestFeatures} if config.deploymentPhase <= DeploymentPhase.Testnet: @@ -818,11 +818,11 @@ proc updateBlocksGossipStatus*( oldGossipForks = currentGossipState - targetGossipState for gossipFork in oldGossipForks: - let forkDigest = node.dag.forkDigests[].atStateFork(gossipFork) + let forkDigest = node.dag.forkDigests[].atConsensusFork(gossipFork) node.network.unsubscribe(getBeaconBlocksTopic(forkDigest)) for gossipFork in newGossipForks: - let forkDigest = node.dag.forkDigests[].atStateFork(gossipFork) + let forkDigest = node.dag.forkDigests[].atConsensusFork(gossipFork) node.network.subscribe( getBeaconBlocksTopic(forkDigest), blocksTopicParams, enableTopicMetrics = true) diff --git a/beacon_chain/nimbus_light_client.nim b/beacon_chain/nimbus_light_client.nim index 9fa7ece4f..071b53540 100644 --- a/beacon_chain/nimbus_light_client.nim +++ b/beacon_chain/nimbus_light_client.nim @@ -247,11 +247,11 @@ programMain: oldGossipForks = currentGossipState - targetGossipState for gossipFork in oldGossipForks: - let forkDigest = forkDigests[].atStateFork(gossipFork) + let forkDigest = forkDigests[].atConsensusFork(gossipFork) network.unsubscribe(getBeaconBlocksTopic(forkDigest)) for gossipFork in newGossipForks: - let forkDigest = forkDigests[].atStateFork(gossipFork) + let forkDigest = forkDigests[].atConsensusFork(gossipFork) network.subscribe( getBeaconBlocksTopic(forkDigest), blocksTopicParams, enableTopicMetrics = true) diff --git a/beacon_chain/rpc/rest_light_client_api.nim b/beacon_chain/rpc/rest_light_client_api.nim index 14d3fa38b..0d903787a 100644 --- a/beacon_chain/rpc/rest_light_client_api.nim +++ b/beacon_chain/rpc/rest_light_client_api.nim @@ -105,7 +105,7 @@ proc installLightClientApiHandlers*(router: var RestRouter, node: BeaconNode) = updates.add RestVersioned[ForkedLightClientUpdate]( data: update, jsonVersion: contextFork, - sszContext: node.dag.forkDigests[].atStateFork(contextFork)) + sszContext: node.dag.forkDigests[].atConsensusFork(contextFork)) return if contentType == sszMediaType: diff --git a/beacon_chain/spec/forks.nim b/beacon_chain/spec/forks.nim index 476aa39cf..dbdf29837 100644 --- a/beacon_chain/spec/forks.nim +++ b/beacon_chain/spec/forks.nim @@ -278,7 +278,7 @@ template BeaconBlockType*(fork: static ConsensusFork): auto = template BeaconBlockBodyType*(fork: static ConsensusFork): auto = getSymbolFromForkModule(fork, "BeaconBlockBody") -template withStateFork*( +template withConsensusFork*( x: ConsensusFork, body: untyped): untyped = case x of ConsensusFork.Deneb: @@ -651,7 +651,7 @@ func stateForkForDigest*( else: err() -func atStateFork*( +func atConsensusFork*( forkDigests: ForkDigests, consensusFork: ConsensusFork): ForkDigest = case consensusFork of ConsensusFork.Deneb: @@ -667,7 +667,7 @@ func atStateFork*( template atEpoch*( forkDigests: ForkDigests, epoch: Epoch, cfg: RuntimeConfig): ForkDigest = - forkDigests.atStateFork(cfg.consensusForkAtEpoch(epoch)) + forkDigests.atConsensusFork(cfg.consensusForkAtEpoch(epoch)) template asSigned*( x: ForkedMsgTrustedSignedBeaconBlock | diff --git a/tests/consensus_spec/test_fixture_light_client_single_merkle_proof.nim b/tests/consensus_spec/test_fixture_light_client_single_merkle_proof.nim index f2b8fef80..d1f7e6de5 100644 --- a/tests/consensus_spec/test_fixture_light_client_single_merkle_proof.nim +++ b/tests/consensus_spec/test_fixture_light_client_single_merkle_proof.nim @@ -65,7 +65,7 @@ suite "EF - Light client - Single merkle proof" & preset(): if kind != pcDir or not dirExists(suitePath): continue let objName = path - withStateFork(fork): + withConsensusFork(fork): for kind, path in walkDir(suitePath, relative = true, checkDir = true): case objName of "BeaconBlockBody": diff --git a/tests/consensus_spec/test_fixture_light_client_update_ranking.nim b/tests/consensus_spec/test_fixture_light_client_update_ranking.nim index 7a4746e2f..25cd1a18f 100644 --- a/tests/consensus_spec/test_fixture_light_client_update_ranking.nim +++ b/tests/consensus_spec/test_fixture_light_client_update_ranking.nim @@ -61,7 +61,7 @@ suite "EF - Light client - Update ranking" & preset(): skip() continue for kind, path in walkDir(testsPath, relative = true, checkDir = true): - withStateFork(fork): + withConsensusFork(fork): const lcDataFork = lcDataForkAtStateFork(consensusFork) when lcDataFork > LightClientDataFork.None: runTest(testsPath/path, lcDataFork)