Query over single connection in runQueryLeadershipSchedule

IntersectMBO · Jul 30, 2023 · 7c0fa56 · 7c0fa56
1 parent f704350
commit 7c0fa56
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Run/Legacy/Query.hs b/cardano-cli/src/Cardano/CLI/Run/Legacy/Query.hs
@@ -1392,15 +1392,15 @@ runQueryLeadershipSchedule
             bpp <- hoistEither . first ShelleyQueryCmdProtocolParameterConversionError $
               bundleProtocolParams era pparams
 
-            pure $ do
-              schedule <- case whichSchedule of
-                CurrentEpoch -> do
+            case whichSchedule of
+              CurrentEpoch -> do
+                pure $ do
                   serCurrentEpochState <- lift (executeLocalStateQueryExpr localNodeConnInfo Nothing $ queryPoolDistribution eInMode sbe (Just (Set.singleton poolid)))
                     & onLeft (left . ShelleyQueryCmdAcquireFailure)
                     & onLeft (left . ShelleyQueryCmdUnsupportedNtcVersion)
                     & onLeft (left . ShelleyQueryCmdLocalStateQueryError . EraMismatchError)
 
-                  firstExceptT ShelleyQueryCmdLeaderShipError $ hoistEither
+                  schedule <- firstExceptT ShelleyQueryCmdLeaderShipError $ hoistEither
                     $ shelleyBasedEraConstraints sbe
                     $ currentEpochEligibleLeadershipSlots
                       sbe
@@ -1413,20 +1413,24 @@ runQueryLeadershipSchedule
                       serCurrentEpochState
                       curentEpoch
 
-                NextEpoch -> do
+                  writeSchedule mJsonOutputFile eInfo shelleyGenesis schedule
+
+              NextEpoch -> do
+                pure $ do
                   serCurrentEpochState <- lift (executeLocalStateQueryExpr localNodeConnInfo Nothing $ queryCurrentEpochState eInMode sbe)
                     & onLeft (left . ShelleyQueryCmdAcquireFailure)
                     & onLeft (left . ShelleyQueryCmdUnsupportedNtcVersion)
                     & onLeft (left . ShelleyQueryCmdLocalStateQueryError . EraMismatchError)
 
                   tip <- liftIO $ getLocalChainTip localNodeConnInfo
 
-                  firstExceptT ShelleyQueryCmdLeaderShipError $ hoistEither
+                  schedule <- firstExceptT ShelleyQueryCmdLeaderShipError $ hoistEither
                     $ shelleyBasedEraConstraints sbe
                     $ nextEpochEligibleLeadershipSlots sbe shelleyGenesis
                       serCurrentEpochState ptclState poolid vrkSkey bpp
                       eInfo (tip, curentEpoch)
-              writeSchedule mJsonOutputFile eInfo shelleyGenesis schedule
+
+                  writeSchedule mJsonOutputFile eInfo shelleyGenesis schedule
           mode ->
             pure $ do
               left . ShelleyQueryCmdUnsupportedMode $ AnyConsensusMode mode