Fixes after rebasing

cardano-scaling · Dec 8, 2023 · ead4dab · ead4dab
1 parent 8f5f024
commit ead4dab
Show file tree

Hide file tree

Showing 4 changed files with 3,432 additions and 3,839 deletions.
diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/TxOut.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/TxOut.hs
@@ -147,13 +147,11 @@ fromPlutusTxOut ::
   Plutus.TxOut ->
   Maybe (TxOut CtxUTxO era)
 fromPlutusTxOut network out = do
-  value <- TxOutValue multiAssetSupportedInEra <$> fromPlutusValue plutusValue
+  value <- TxOutValue maryEraOnwards <$> fromPlutusValue plutusValue
   pure $ TxOut addressInEra value datum ReferenceScriptNone
  where
   addressInEra = fromPlutusAddress network plutusAddress
 
-  value = TxOutValue maryEraOnwards $ fromPlutusValue plutusValue
-
   datum = case plutusDatum of
     NoOutputDatum -> TxOutDatumNone
     OutputDatumHash (Plutus.DatumHash hashBytes) ->

diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/Value.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/Value.hs
@@ -10,7 +10,6 @@ import Data.Word (Word64)
 import Hydra.Cardano.Api.CtxUTxO (ToUTxOContext (..))
 import Hydra.Cardano.Api.Hash (unsafeScriptHashFromBytes)
 import Hydra.Cardano.Api.MaryEraOnwards (maryEraOnwards)
-import Hydra.Cardano.Api.MultiAssetSupportedInEra (multiAssetSupportedInEra)
 import Hydra.Cardano.Api.PolicyId (fromPlutusCurrencySymbol)
 import PlutusLedgerApi.V1.Value (flattenValue)
 import PlutusLedgerApi.V2 (adaSymbol, adaToken, fromBuiltin, unTokenName)

diff --git a/hydra-chain-observer/src/Hydra/ChainObserver.hs b/hydra-chain-observer/src/Hydra/ChainObserver.hs
@@ -7,7 +7,6 @@ import Hydra.Prelude
 import Hydra.Cardano.Api (
   Block (..),
   BlockInMode (..),
-  CardanoEra (..),
   CardanoMode,
   ChainPoint,
   ChainSyncClient,