PLT-1317-restructure-marconi-and-rewindable-index

Change to marconi-chain-index module name in marconi-mamba
IntersectMBO · Feb 6, 2023 · 5cc3e40 · 5cc3e40
1 parent b8660bb
commit 5cc3e40
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/marconi-mamba/marconi-mamba.cabal b/marconi-mamba/marconi-mamba.cabal
@@ -132,7 +132,7 @@ executable examples-json-rpc-client
   --------------------
   -- Local components
   --------------------
-  build-depends:  marconi-chain-index
+  build-depends:  marconi-chain-index:{marconi-chain-index, json-rpc}
 
   ------------------------
   -- Non-IOG dependencies

diff --git a/marconi-mamba/src/Marconi/Api/UtxoIndexersQuery.hs b/marconi-mamba/src/Marconi/Api/UtxoIndexersQuery.hs
@@ -27,9 +27,9 @@ import Marconi.Api.Types (HasUtxoIndexerEnv (uiIndexer, uiQaddresses),
                           QueryExceptions (AddressNotInListError, QueryError),
                           UtxoIndexerEnv (UtxoIndexerEnv, _uiIndexer, _uiQaddresses),
                           UtxoIndexerWrapper (UtxoIndexerWrapper, unWrap), UtxoReport (UtxoReport))
-import Marconi.Index.Utxo qualified as Utxo
-import Marconi.Types (TargetAddresses)
-import RewindableIndex.Storable qualified as Storable
+import Marconi.ChainIndex.Indexers.Utxo qualified as Utxo
+import Marconi.ChainIndex.Types (TargetAddresses)
+import Marconi.Core.Storable qualified as Storable
 
 -- | Bootstraps the utxo query environment.
 -- The module is responsible for accessing SQLite for quries.

diff --git a/marconi-mamba/src/Marconi/Bootstrap.hs b/marconi-mamba/src/Marconi/Bootstrap.hs
@@ -22,8 +22,8 @@ import Marconi.Api.HttpServer qualified as Http
 import Marconi.Api.Types (CliArgs (CliArgs), HasJsonRpcEnv (queryEnv), HasUtxoIndexerEnv (uiIndexer),
                           JsonRpcEnv (JsonRpcEnv, _httpSettings, _queryEnv), RpcPortNumber)
 import Marconi.Api.UtxoIndexersQuery (UtxoIndexer, bootstrap, writeTMVar')
-import Marconi.Indexers (mkIndexerStream, startIndexers, utxoWorker)
-import Marconi.Types (TargetAddresses)
+import Marconi.ChainIndex.Indexers (mkIndexerStream, startIndexers, utxoWorker)
+import Marconi.ChainIndex.Types (TargetAddresses)
 
 
 -- | Bootstraps the JSON-RPC  http server with appropriate settings and marconi cache

diff --git a/marconi-mamba/src/Marconi/MambaCli.hs b/marconi-mamba/src/Marconi/MambaCli.hs
@@ -6,7 +6,7 @@ import Options.Applicative (Parser, ParserInfo, auto, execParser, fullDesc, head
 import System.Environment (lookupEnv)
 
 import Marconi.Api.Types (CliArgs (CliArgs))
-import Marconi.CLI (multiString, pNetworkId)
+import Marconi.ChainIndex.CLI (multiString, pNetworkId)
 
 
 -- | parse cli arguments

diff --git a/marconi-mamba/test/Spec/UtxoIndexersQuery.hs b/marconi-mamba/test/Spec/UtxoIndexersQuery.hs
@@ -28,10 +28,10 @@ import Gen.Cardano.Api.Typed qualified as CGen
 import Marconi.Api.Types (HasUtxoIndexerEnv (uiIndexer))
 
 import Marconi.Api.UtxoIndexersQuery qualified as UIQ
-import Marconi.Index.Utxo qualified as Utxo
-import Marconi.Types (TargetAddresses)
-import RewindableIndex.Storable (StorableEvent)
-import RewindableIndex.Storable qualified as Storable
+import Marconi.ChainIndex.Indexers.Utxo qualified as Utxo
+import Marconi.ChainIndex.Types (TargetAddresses)
+import Marconi.Core.Storable (StorableEvent)
+import Marconi.Core.Storable qualified as Storable
 
 genSlotNo :: Hedgehog.MonadGen m => m C.SlotNo
 genSlotNo = C.SlotNo <$> Gen.word64 (Range.linear 10 1000)