fourmolu and pr stuff

Author: Cmdv

cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Conway.hs

@@ -31,7 +31,7 @@ module Cardano.Mock.Forging.Tx.Conway (
   mkDepositTxPools,
   mkDummyRegisterTx,
   mkDummyTxBody,
-  mkDummyTxBodyWithCoin,
+  mkDummyTxBodyWithFee,
   mkTxDelegCert,
   mkRegTxCert,
   mkUnRegTxCert,
@@ -484,10 +484,10 @@ mkDummyTxBody =
     mempty
     (Withdrawals mempty)
 
-mkDummyTxBodyWithCoin ::
+mkDummyTxBodyWithFee ::
   Coin ->
   ConwayTxBody StandardConway
-mkDummyTxBodyWithCoin coin' =
+mkDummyTxBodyWithFee coin' =
   consTxBody
     mempty
     mempty

cardano-chain-gen/test/Test/Cardano/Db/Mock/Config.hs

@@ -67,7 +67,7 @@ import Control.Concurrent.STM.TMVar (
   tryPutTMVar,
   tryReadTMVar,
  )
-import Control.Exception (SomeException, bracket)
+import Control.Exception (SomeException, bracket, catch)
 import Control.Monad (void)
 import Control.Monad.Extra (eitherM)
 import Control.Monad.Logger (NoLoggingT, runNoLoggingT)
@@ -85,9 +85,8 @@ import Ouroboros.Consensus.Shelley.Node (ShelleyLeaderCredentials)
 import System.Directory (createDirectoryIfMissing, removePathForcibly)
 import System.FilePath.Posix (takeDirectory, (</>))
 import System.IO.Silently (hSilence)
-import Test.Tasty.HUnit (Assertion, testCase, assertFailure)
-import Control.Exception (catch)
 import Test.Tasty (TestTree)
+import Test.Tasty.HUnit (Assertion, assertFailure, testCase)
 
 data Config = Config
   { topLevelConfig :: TopLevelConfig CardanoBlock
@@ -523,7 +522,7 @@ replaceConfigFile newFilename dbSync@DBSyncEnv {..} = do
 
 expectFailSilent :: String -> Assertion -> TestTree
 expectFailSilent name action = testCase name $ do
-    result <- catch (Right <$> action) (\(_ :: SomeException) -> pure $ Left ())
-    case result of
-        Left _ -> pure ()  -- Test failed as expected, do nothing
-        Right _ -> assertFailure "Expected test to fail but it succeeded"
+  result <- catch (Right <$> action) (\(_ :: SomeException) -> pure $ Left ())
+  case result of
+    Left _ -> pure () -- Test failed as expected, do nothing
+    Right _ -> assertFailure "Expected test to fail but it succeeded"

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Tx.hs

@@ -181,12 +181,12 @@ addTxMetadataWhitelist ioManager metadata = do
       -- Add transactions with metadata
       void $ do
         UnifiedApi.withConwayFindLeaderAndSubmitTx interpreter mockServer $ \_ ->
-          let txBody = Conway.mkDummyTxBodyWithCoin $ Coin 1_000
+          let txBody = Conway.mkDummyTxBodyWithFee $ Coin 1_000
               auxData = Map.fromList [(1, I 1), (2, I 2), (3, I 3), (4, I 4)]
            in Right (Conway.mkAuxDataTx True txBody auxData)
       void $ do
         UnifiedApi.withConwayFindLeaderAndSubmitTx interpreter mockServer $ \_ ->
-          let txBody = Conway.mkDummyTxBodyWithCoin $ Coin 2_000
+          let txBody = Conway.mkDummyTxBodyWithFee $ Coin 2_000
               auxData = Map.fromList [(5, I 5), (6, I 6), (7, I 7), (8, I 8)]
            in Right (Conway.mkAuxDataTx True txBody auxData)
 
@@ -222,12 +222,12 @@ addTxMetadataWhitelistMultiple ioManager metadata = do
       -- Add transactions with metadata
       void $ do
         UnifiedApi.withConwayFindLeaderAndSubmitTx interpreter mockServer $ \_ ->
-          let txBody = Conway.mkDummyTxBodyWithCoin $ Coin 1_000
+          let txBody = Conway.mkDummyTxBodyWithFee $ Coin 1_000
               auxData = Map.fromList [(1, I 1), (2, I 2), (3, I 3), (4, I 4)]
            in Right (Conway.mkAuxDataTx True txBody auxData)
       void $ do
         UnifiedApi.withConwayFindLeaderAndSubmitTx interpreter mockServer $ \_ ->
-          let txBody = Conway.mkDummyTxBodyWithCoin $ Coin 2_000
+          let txBody = Conway.mkDummyTxBodyWithFee $ Coin 2_000
               auxData = Map.fromList [(5, I 5), (6, I 6), (7, I 7), (8, I 8)]
            in Right (Conway.mkAuxDataTx True txBody auxData)
 

cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/Other.hs

@@ -164,13 +164,12 @@ insertStakeAddressRefIfMissing _trce cache addr =
 
 insertMultiAsset ::
   (MonadBaseControl IO m, MonadIO m) =>
-  Trace IO Text ->
   Cache ->
   Maybe (NonEmpty ShortByteString) ->
   PolicyID StandardCrypto ->
   AssetName ->
   ReaderT SqlBackend m (Maybe DB.MultiAssetId)
-insertMultiAsset _tracer cache mWhitelist policy aName = do
+insertMultiAsset cache mWhitelist policy aName = do
   mId <- queryMAWithCache cache policy aName
   case mId of
     Right maId -> pure $ Just maId

cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/Tx.hs

@@ -175,8 +175,8 @@ insertTx syncEnv isMember blkId epochNo slotNo applyResult blockIndex tx grouped
       maTxMint <-
         case ioMultiAssets iopts of
           MultiAssetDisable -> pure mempty
-          MultiAssetEnable -> insertMaTxMint tracer cache Nothing txId $ Generic.txMint tx
-          MultiAssetPolicies whitelist -> insertMaTxMint tracer cache (Just whitelist) txId $ Generic.txMint tx
+          MultiAssetEnable -> insertMaTxMint cache Nothing txId $ Generic.txMint tx
+          MultiAssetPolicies whitelist -> insertMaTxMint cache (Just whitelist) txId $ Generic.txMint tx
 
       when (isPlutusEnabled $ ioPlutus iopts) $
         mapM_ (lift . insertScript tracer txId) $
@@ -244,10 +244,10 @@ insertTxOut tracer cache iopts (txId, txHash) (Generic.TxOut index addr value ma
       case ioMultiAssets iopts of
         MultiAssetDisable -> pure (eutxo, mempty)
         MultiAssetEnable -> do
-          !maTxOuts <- insertMaTxOuts tracer cache Nothing maMap
+          !maTxOuts <- insertMaTxOuts cache Nothing maMap
           pure (eutxo, maTxOuts)
         MultiAssetPolicies whitelist -> do
-          !maTxOuts <- insertMaTxOuts tracer cache (Just whitelist) maMap
+          !maTxOuts <- insertMaTxOuts cache (Just whitelist) maMap
           pure (eutxo, maTxOuts)
 
     hasScript :: Bool
@@ -310,13 +310,12 @@ prepareTxMetadata tracer mWhitelist txId mmetadata =
 --------------------------------------------------------------------------------------
 insertMaTxMint ::
   (MonadBaseControl IO m, MonadIO m) =>
-  Trace IO Text ->
   Cache ->
   Maybe (NonEmpty ShortByteString) ->
   DB.TxId ->
   MultiAsset StandardCrypto ->
   ExceptT SyncNodeError (ReaderT SqlBackend m) [DB.MaTxMint]
-insertMaTxMint tracer cache mWhitelist txId (MultiAsset mintMap) =
+insertMaTxMint cache mWhitelist txId (MultiAsset mintMap) =
   concatMapM (lift . prepareOuter) $ Map.toList mintMap
   where
     prepareOuter ::
@@ -332,7 +331,7 @@ insertMaTxMint tracer cache mWhitelist txId (MultiAsset mintMap) =
       (AssetName, Integer) ->
       ReaderT SqlBackend m (Maybe DB.MaTxMint)
     prepareInner policy (aname, amount) = do
-      maybeMaId <- insertMultiAsset tracer cache mWhitelist policy aname
+      maybeMaId <- insertMultiAsset cache mWhitelist policy aname
       pure $ case maybeMaId of
         Just maId ->
           Just $
@@ -345,12 +344,11 @@ insertMaTxMint tracer cache mWhitelist txId (MultiAsset mintMap) =
 
 insertMaTxOuts ::
   (MonadBaseControl IO m, MonadIO m) =>
-  Trace IO Text ->
   Cache ->
   Maybe (NonEmpty ShortByteString) ->
   Map (PolicyID StandardCrypto) (Map AssetName Integer) ->
   ExceptT SyncNodeError (ReaderT SqlBackend m) [MissingMaTxOut]
-insertMaTxOuts tracer cache mWhitelist maMap =
+insertMaTxOuts cache mWhitelist maMap =
   concatMapM (lift . prepareOuter) $ Map.toList maMap
   where
     prepareOuter ::
@@ -366,7 +364,7 @@ insertMaTxOuts tracer cache mWhitelist maMap =
       (AssetName, Integer) ->
       ReaderT SqlBackend m (Maybe MissingMaTxOut)
     prepareInner policy (aname, amount) = do
-      mMaId <- insertMultiAsset tracer cache mWhitelist policy aname
+      mMaId <- insertMultiAsset cache mWhitelist policy aname
       pure $ case mMaId of
         Just maId ->
           Just $