Add fromInAnyCardanoEra, delete comments

j-mueller · Aug 9, 2024 · 312a761 · 312a761
1 parent c5fccb6
commit 312a761
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/base/lib/Convex/Eras.hs b/src/base/lib/Convex/Eras.hs
@@ -8,6 +8,7 @@ module Convex.Eras(
   inAnyBabbageEraOnwardsBabbage,
   inAnyBabbageEraOnwardsConway,
   toInAnyCardanoEra,
+  fromInAnyCardanoEra,
   -- * Downgrades to babbage era
   babbageProtocolParams,
   babbageTxOut,
@@ -17,7 +18,8 @@ module Convex.Eras(
 
 import           Cardano.Api              (BabbageEra, BabbageEraOnwards (..),
                                            ConwayEra)
-import           Cardano.Api.Shelley      (CtxUTxO, InAnyCardanoEra (..),
+import           Cardano.Api.Shelley      (CardanoEra (..), CtxUTxO,
+                                           InAnyCardanoEra (..),
                                            LedgerProtocolParameters (..),
                                            ReferenceScript (..), TxOut (..),
                                            TxOutDatum (..), UTxO (..))
@@ -42,6 +44,13 @@ toInAnyCardanoEra = \case
   InAnyBabbageEraOnwards BabbageEraOnwardsBabbage thing -> C.inAnyCardanoEra C.cardanoEra thing
   InAnyBabbageEraOnwards BabbageEraOnwardsConway thing -> C.inAnyCardanoEra C.cardanoEra thing
 
+-- | Strengthen 'InAnyCardanoEra' to 'InAnyBabbageEraOnwards'
+fromInAnyCardanoEra :: InAnyCardanoEra thing -> Maybe (InAnyBabbageEraOnwards thing)
+fromInAnyCardanoEra = \case
+  InAnyCardanoEra BabbageEra thing -> Just (InAnyBabbageEraOnwards BabbageEraOnwardsBabbage thing)
+  InAnyCardanoEra ConwayEra thing -> Just (InAnyBabbageEraOnwards BabbageEraOnwardsConway thing)
+  _ -> Nothing
+
 -- | Constructor for 'InAnyBabbageEraOnwards'
 inAnyBabbageEraOnwards :: Typeable era => BabbageEraOnwards era -> thing era -> InAnyBabbageEraOnwards thing
 inAnyBabbageEraOnwards = InAnyBabbageEraOnwards

diff --git a/src/devnet/lib/Convex/Devnet/NodeQueries.hs b/src/devnet/lib/Convex/Devnet/NodeQueries.hs
@@ -167,19 +167,6 @@ queryUTxOFilterBabbage networkId socket flt =
           )
    in queryLocalState query networkId socket >>= throwOnEraMismatch
 
--- | Query UTxO for all given addresses at given point.
---
--- Throws at least 'QueryException' if query fails.
--- queryUTxOByTxInBabbage :: NetworkId -> FilePath -> Set TxIn -> IO (UTxO C.BabbageEra)
--- queryUTxOByTxInBabbage networkId socket flt =
---   let query =
---         C.QueryInEra
---           ( C.QueryInShelleyBasedEra
---               C.ShelleyBasedEraBabbage
---               ( C.QueryUTxO flt)
---           )
---    in queryLocalState query networkId socket >>= throwOnEraMismatch
-
 -- | Query UTxO for all given addresses at given point.
 --
 -- Throws at least 'QueryException' if query fails.