Move DecodeOgmios to Ogmios.Types

Author: marcusbfs

src/Contract/Backend/Ogmios/Mempool.purs

@@ -22,8 +22,8 @@ import Control.Monad.Reader.Trans (asks)
 import Ctl.Internal.Contract.Monad (wrapQueryM)
 import Ctl.Internal.Logging (Logger, mkLogger)
 import Ctl.Internal.QueryM (QueryM)
-import Ctl.Internal.QueryM.JsonRpc2 as JsonRpc2
 import Ctl.Internal.QueryM.Ogmios.JsWebSocket (JsWebSocket)
+import Ctl.Internal.QueryM.Ogmios.JsonRpc2 as JsonRpc2
 import Ctl.Internal.QueryM.Ogmios.Mempool
   ( ListenerSet
   , OgmiosListeners

src/Internal/Contract/Monad.purs

@@ -56,7 +56,6 @@ import Ctl.Internal.Contract.ProviderBackend
 import Ctl.Internal.Helpers (filterMapWithKeyM, liftM, logWithLevel)
 import Ctl.Internal.Logging (Logger, mkLogger, setupLogs)
 import Ctl.Internal.QueryM (QueryM)
-import Ctl.Internal.QueryM.JsonRpc2 (OgmiosDecodeError, pprintOgmiosDecodeError)
 import Ctl.Internal.QueryM.Kupo (isTxConfirmedAff)
 import Ctl.Internal.QueryM.Ogmios
   ( getProtocolParameters
@@ -69,6 +68,10 @@ import Ctl.Internal.QueryM.Ogmios.Mempool
   , underlyingWebSocket
   )
 import Ctl.Internal.QueryM.Ogmios.Queries (QueryEnv)
+import Ctl.Internal.QueryM.Ogmios.Types
+  ( OgmiosDecodeError
+  , pprintOgmiosDecodeError
+  )
 import Ctl.Internal.Service.Blockfrost
   ( BlockfrostServiceM
   , runBlockfrostServiceM

src/Internal/QueryM.purs

@@ -1,7 +1,5 @@
 -- | CTL query layer monad.
--- | This module defines an Aff interface for Ogmios Websocket Queries.
--- | Since WebSockets do not define a mechanism for linking request/response.
--- | Or for verifying that the connection is live, those concerns are addressed here
+-- | This module defines an Aff interface for backend queries.
 module Ctl.Internal.QueryM
   ( QueryM
   , ParQueryM

src/Internal/QueryM/CurrentEpoch.purs

@@ -7,9 +7,8 @@ import Prelude
 
 import Control.Monad.Error.Class (throwError)
 import Ctl.Internal.QueryM (QueryM)
-import Ctl.Internal.QueryM.JsonRpc2 (pprintOgmiosDecodeError)
 import Ctl.Internal.QueryM.Ogmios (currentEpoch) as Ogmios
-import Ctl.Internal.QueryM.Ogmios.Types (CurrentEpoch)
+import Ctl.Internal.QueryM.Ogmios.Types (CurrentEpoch, pprintOgmiosDecodeError)
 import Data.Either (Either(Right, Left))
 import Effect.Exception (error)
 

src/Internal/QueryM/EraSummaries.purs

@@ -8,8 +8,8 @@ import Prelude
 import Cardano.Types.EraSummaries (EraSummaries)
 import Control.Monad.Error.Class (throwError)
 import Ctl.Internal.QueryM (QueryM)
-import Ctl.Internal.QueryM.JsonRpc2 (pprintOgmiosDecodeError)
 import Ctl.Internal.QueryM.Ogmios (eraSummaries) as Ogmios
+import Ctl.Internal.QueryM.Ogmios.Types (pprintOgmiosDecodeError)
 import Data.Either (Either(Right, Left))
 import Data.Newtype (unwrap)
 import Effect.Exception (error)

src/Internal/QueryM/JsonRpc2.purs

@@ -33,24 +33,22 @@ import Control.Monad.Error.Class (class MonadThrow, throwError)
 import Control.Monad.Reader.Class (asks)
 import Ctl.Internal.Affjax (request) as Affjax
 import Ctl.Internal.QueryM (QueryM)
-import Ctl.Internal.QueryM.JsonRpc2
-  ( class DecodeOgmios
-  , OgmiosDecodeError(ResultDecodingError, ClientErrorResponse)
-  , decodeOgmios
-  , pprintOgmiosDecodeError
-  )
 import Ctl.Internal.QueryM.Ogmios.Types
-  ( AdditionalUtxoSet
+  ( class DecodeOgmios
+  , AdditionalUtxoSet
   , ChainTipQR(CtChainPoint, CtChainOrigin)
   , CurrentEpoch
   , DelegationsAndRewardsR
+  , OgmiosDecodeError(ResultDecodingError, ClientErrorResponse)
   , OgmiosEraSummaries
   , OgmiosProtocolParameters
   , OgmiosSystemStart
   , OgmiosTxEvaluationR
   , PoolParametersR
   , StakePoolsQueryArgument
   , SubmitTxR
+  , decodeOgmios
+  , pprintOgmiosDecodeError
   )
 import Ctl.Internal.ServerConfig (ServerConfig, mkHttpUrl)
 import Data.Bifunctor (lmap)

src/Internal/QueryM/Ogmios.purs

@@ -16,7 +16,7 @@ import Prelude
 
 import Aeson (Aeson, JsonDecodeError, stringifyAeson)
 import Cardano.Types.TransactionHash (TransactionHash)
-import Ctl.Internal.QueryM.JsonRpc2 (parseJsonRpc2ResponseId)
+import Ctl.Internal.QueryM.Ogmios.JsonRpc2 (parseJsonRpc2ResponseId)
 import Ctl.Internal.QueryM.UniqueId (ListenerId)
 import Data.Either (Either(Left, Right))
 import Data.Map (Map)