Marconi index utxo for aditional slot info

Add CLI golden tests for marconi
IntersectMBO · Dec 4, 2022 · 4a14855 · 4a14855
1 parent 1596c33
commit 4a14855
Show file tree

Hide file tree

Showing 15 changed files with 187 additions and 487 deletions.
diff --git a/marconi-mamba/examples/json-rpc-server/src/Main.hs b/marconi-mamba/examples/json-rpc-server/src/Main.hs
@@ -19,7 +19,7 @@ import Marconi.Api.Types (DBQueryEnv, HasDBQueryEnv (queryTMVar), HasJsonRpcEnv
                           unUtxoIndex)
 import Marconi.Bootstrap (bootstrapHttp, bootstrapJsonRpc)
 import Marconi.CLI (multiString)
-import Marconi.Index.Utxos (Depth (Depth), open)
+import Marconi.Index.Utxo (Depth (Depth), open)
 
 
 data CliOptions = CliOptions

diff --git a/marconi-mamba/src/Marconi/Api/Types.hs b/marconi-mamba/src/Marconi/Api/Types.hs
@@ -38,7 +38,7 @@ import GHC.Generics (Generic)
 import Network.Wai.Handler.Warp (Settings)
 
 import Cardano.Api (NetworkId)
-import Marconi.Index.Utxos (UtxoRow)
+import Marconi.Index.Utxo (UtxoRow)
 import Marconi.Indexers (UtxoQueryTMVar (UtxoQueryTMVar, unUtxoIndex))
 import Marconi.Types as Export (TargetAddresses)
 

diff --git a/marconi-mamba/src/Marconi/Api/UtxoIndexersQuery.hs b/marconi-mamba/src/Marconi/Api/UtxoIndexersQuery.hs
@@ -6,8 +6,8 @@ module Marconi.Api.UtxoIndexersQuery
     , findByAddress
     , findAll
     , reportQueryAddresses
-    , Utxos.UtxoRow(..)
-    , Utxos.UtxoIndex
+    , Utxo.UtxoRow(..)
+    , Utxo.UtxoIndex
     , reportQueryCardanoAddresses
     , reportBech32Addresses
     , withQueryAction
@@ -26,7 +26,7 @@ import Marconi.Api.Types (DBQueryEnv (DBQueryEnv, _queryAddresses, _queryTMVar),
                           HasDBQueryEnv (queryAddresses, queryTMVar),
                           QueryExceptions (AddressNotInListError, QueryError), TargetAddresses,
                           UtxoTxOutReport (UtxoTxOutReport))
-import Marconi.Index.Utxos qualified as Utxos
+import Marconi.Index.Utxo qualified as Utxo
 import Marconi.Indexers (UtxoQueryTMVar (UtxoQueryTMVar, unUtxoIndex))
 
 -- | Bootstraps the utxo query environment.
@@ -36,7 +36,7 @@ bootstrap
     :: TargetAddresses          -- ^ user provided target addresses
     -> IO DBQueryEnv            -- ^ returns Query runtime environment
 bootstrap targetAddresses = do
-    ix <- atomically (newEmptyTMVar :: STM (TMVar Utxos.UtxoIndex) )
+    ix <- atomically (newEmptyTMVar :: STM (TMVar Utxo.UtxoIndex) )
     pure $ DBQueryEnv
         {_queryTMVar = UtxoQueryTMVar ix
         , _queryAddresses = targetAddresses
@@ -60,7 +60,7 @@ findAll env = forConcurrently addresses f
 findByCardanoAddress
     :: DBQueryEnv                   -- ^ Query run time environment
     -> C.AddressAny      -- ^ Cardano address to query
-    -> IO [Utxos.UtxoRow]
+    -> IO [Utxo.UtxoRow]
 findByCardanoAddress env address = withQueryAction env  address
 
 -- | Retrieve a Set of TxOutRefs associated with the given Cardano Era address
@@ -90,12 +90,12 @@ findByAddress env addressText =
 withQueryAction
     :: DBQueryEnv                                           -- ^ Query run time environment
     -> C.AddressAny                                      -- ^ Cardano address to query
-    -> IO [Utxos.UtxoRow]
+    -> IO [Utxo.UtxoRow]
 withQueryAction env address =
     let
         utxoIndexer = unUtxoIndex  $ env ^. queryTMVar
-        action :: Utxos.UtxoIndex -> IO [Utxos.UtxoRow]
-        action ndxr = (Utxos.queryPlusVolatile ndxr address) >>= pure . (\case { Just x -> x; _ -> [] })
+        action :: Utxo.UtxoIndex -> IO [Utxo.UtxoRow]
+        action ndxr = (Utxo.queryPlusVolatile ndxr address) >>= pure . (\case { Just x -> x; _ -> [] })
     in
         bracket
           (atomically $ takeTMVar  utxoIndexer)

diff --git a/marconi/marconi.cabal b/marconi/marconi.cabal
@@ -46,7 +46,7 @@ library
     Marconi.CLI
     Marconi.Index.Datum
     Marconi.Index.ScriptTx
-    Marconi.Index.Utxos
+    Marconi.Index.Utxo
     Marconi.Indexers
     Marconi.Logging
     Marconi.Orphans
@@ -125,8 +125,9 @@ test-suite marconi-test
   main-is:        Spec.hs
   hs-source-dirs: test
   other-modules:
-    Index.Spec
     Integration
+    Spec.Cli
+    Spec.Utxo
 
   --------------------
   -- Local components
@@ -153,20 +154,23 @@ test-suite marconi-test
   ------------------------
   build-depends:
     , aeson
-    , base             >=4.9 && <5
+    , base                  >=4.9 && <5
     , bytestring
     , containers
     , directory
     , filepath
     , hedgehog
     , hedgehog-extras
     , lens
+    , optparse-applicative
     , prettyprinter
     , serialise
     , sqlite-simple
     , stm
     , streaming
     , tasty
+    , tasty-golden
     , tasty-hedgehog
     , tasty-hunit
     , temporary
+    , text
diff --git a/marconi/src/Marconi/CLI.hs b/marconi/src/Marconi/CLI.hs
@@ -6,6 +6,7 @@ module Marconi.CLI
     , parseCardanoAddresses
     , pNetworkId
     , Options (..)
+    , optionsParser
     , parseOptions
     , utxoDbPath
     , datumDbPath