Kill the need for join

IntersectMBO · Jan 19, 2023 · a05ceb0 · a05ceb0
1 parent bdb4d2c
commit a05ceb0
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
@@ -1019,30 +1019,31 @@ runQueryStakePools
   -> ExceptT ShelleyQueryCmdError IO ()
 runQueryStakePools (AnyConsensusModeParams cModeParams)
                           network mOutFile = do
-  SocketPath sockPath <- firstExceptT ShelleyQueryCmdEnvVarSocketErr
-                           $ newExceptT readEnvSocketPath
+  SocketPath sockPath <- lift readEnvSocketPath & onLeft (throwE . ShelleyQueryCmdEnvVarSocketErr)
 
   let localNodeConnInfo = LocalNodeConnectInfo cModeParams network sockPath
 
-  poolIds <- ExceptT . fmap (join . first ShelleyQueryCmdAcquireFailure) $
-    executeLocalStateQueryExpr localNodeConnInfo Nothing $ runExceptT @ShelleyQueryCmdError $ do
-      anyE@(AnyCardanoEra era) <- case consensusModeOnly cModeParams of
-        ByronMode -> return $ AnyCardanoEra ByronEra
-        ShelleyMode -> return $ AnyCardanoEra ShelleyEra
-        CardanoMode ->
-          lift (queryExpr $ QueryCurrentEra CardanoModeIsMultiEra)
-            & onLeft (throwE . ShelleyQueryCmdUnsupportedNtcVersion)
+  poolIds <-
+    ( lift $ executeLocalStateQueryExpr localNodeConnInfo Nothing $ runExceptT @ShelleyQueryCmdError $ do
+        anyE@(AnyCardanoEra era) <- case consensusModeOnly cModeParams of
+          ByronMode -> return $ AnyCardanoEra ByronEra
+          ShelleyMode -> return $ AnyCardanoEra ShelleyEra
+          CardanoMode ->
+            lift (queryExpr $ QueryCurrentEra CardanoModeIsMultiEra)
+              & onLeft (throwE . ShelleyQueryCmdUnsupportedNtcVersion)
 
-      let cMode = consensusModeOnly cModeParams
+        let cMode = consensusModeOnly cModeParams
 
-      eInMode <- toEraInMode era cMode
-        & hoistMaybe (ShelleyQueryCmdEraConsensusModeMismatch (AnyConsensusMode cMode) anyE)
+        eInMode <- toEraInMode era cMode
+          & hoistMaybe (ShelleyQueryCmdEraConsensusModeMismatch (AnyConsensusMode cMode) anyE)
 
-      sbe <- getSbe $ cardanoEraStyle era
+        sbe <- getSbe $ cardanoEraStyle era
 
-      lift (queryExpr (QueryInEra eInMode $ QueryInShelleyBasedEra sbe $ QueryStakePools))
-        & onLeft (throwE . ShelleyQueryCmdUnsupportedNtcVersion)
-        & onLeft (throwE . ShelleyQueryCmdEraMismatch)
+        lift (queryExpr (QueryInEra eInMode $ QueryInShelleyBasedEra sbe $ QueryStakePools))
+          & onLeft (throwE . ShelleyQueryCmdUnsupportedNtcVersion)
+          & onLeft (throwE . ShelleyQueryCmdEraMismatch)
+    ) & onLeft (throwE . ShelleyQueryCmdAcquireFailure)
+      & onLeft throwE
 
   writeStakePools mOutFile poolIds