Make historicalSummariesFork const

Author: kdeme

beacon_chain/rpc/rest_nimbus_api.nim

@@ -548,28 +548,31 @@ proc installNimbusApiHandlers*(router: var RestRouter, node: BeaconNode) =
     node.withStateForBlockSlotId(bslot):
       return withState(state):
         when consensusFork >= ConsensusFork.Capella:
-          let summariesFork = historicalSummariesForkAtConsensusFork(consensusFork).valueOr:
-            return RestApiResponse.jsonError(Http404, HistoricalSummariesUnavailable)
-
-          withHistoricalSummariesFork(summariesFork):
-            let response = getHistoricalSummariesResponse(historicalSummariesFork)(
-              historical_summaries: forkyState.data.historical_summaries,
-              proof: forkyState.data.build_proof(
-                historicalSummariesFork.historical_summaries_gindex).expect("Valid gindex"),
-              slot: bslot.slot)
-
-            if contentType == jsonMediaType:
-              RestApiResponse.jsonResponseFinalizedWVersion(
-                response,
-                node.getStateOptimistic(state),
-                node.dag.isFinalized(bslot.bid),
-                consensusFork)
-            elif contentType == sszMediaType:
-              let headers = [("eth-consensus-version", consensusFork.toString())]
-              RestApiResponse.sszResponse(response, headers)
-            else:
-              RestApiResponse.jsonError(Http500, InvalidAcceptError)
+          const historicalSummariesFork = historicalSummariesForkAtConsensusFork(
+              consensusFork
+            )
+            .expect("HistoricalSummariesFork for Capella onwards")
+
+          let response = getHistoricalSummariesResponse(historicalSummariesFork)(
+            historical_summaries: forkyState.data.historical_summaries,
+            proof: forkyState.data
+              .build_proof(historicalSummariesFork.historical_summaries_gindex)
+              .expect("Valid gindex"),
+            slot: bslot.slot,
+          )
 
+          if contentType == jsonMediaType:
+            RestApiResponse.jsonResponseFinalizedWVersion(
+              response,
+              node.getStateOptimistic(state),
+              node.dag.isFinalized(bslot.bid),
+              consensusFork,
+            )
+          elif contentType == sszMediaType:
+            let headers = [("eth-consensus-version", consensusFork.toString())]
+            RestApiResponse.sszResponse(response, headers)
+          else:
+            RestApiResponse.jsonError(Http500, InvalidAcceptError)
         else:
           RestApiResponse.jsonError(Http404, HistoricalSummariesUnavailable)
 

beacon_chain/spec/eth2_apis/rest_types.nim

@@ -1165,12 +1165,3 @@ func historicalSummariesForkAtConsensusFork*(consensusFork: ConsensusFork): Opt[
     Opt.some HistoricalSummariesFork.Capella
   else:
     Opt.none HistoricalSummariesFork
-
-template withHistoricalSummariesFork*(x: HistoricalSummariesFork, body: untyped): untyped =
-  case x
-  of HistoricalSummariesFork.Electra:
-    const historicalSummariesFork {.inject, used.} = HistoricalSummariesFork.Electra
-    body
-  of HistoricalSummariesFork.Capella:
-    const historicalSummariesFork {.inject, used.} = HistoricalSummariesFork.Capella
-    body