Skip to content

Commit

Permalink
Remove ouroboros-consensus dependency of hydra-cardano-api
Browse files Browse the repository at this point in the history
This was unnecessary and should simplify depending on it.
  • Loading branch information
ch1bo committed Nov 29, 2022
1 parent fcb1131 commit 70c14fe
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 58 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -12,6 +12,9 @@ changes.

- API server responses now contain a `timestamp` and a monotonic `seq`uence number. [#618](https://github.com/input-output-hk/hydra/pull/618)

- **BREAKING** `hydra-cardano-api` changes:
+ Remove `Hydra.Cardano.Api.SlotNo` module.

## [0.8.1] - 2022-11-17

- **BREAKING** Implemented [ADR18](https://hydra.family/head-protocol/adr/18) to keep only a single state:
Expand Down
9 changes: 9 additions & 0 deletions cabal.project
Expand Up @@ -117,6 +117,15 @@ constraints:
, vector-map == 0.1.0.0
, cardano-data == 0.1.0.0

-- TODO: Fixed import of cardano-prelude (not import cborError)
source-repository-package
type: git
location: https://github.com/input-output-hk/ouroboros-network.git
tag: 31fe34df94d94efc9a6614e0fe780ec6b5082a61
--sha256: 0000000000000000000000000000000000000000000000000000
subdir:
ouroboros-consensus-byron

allow-newer:
*:aeson,
monoidal-containers:aeson,
Expand Down
8 changes: 1 addition & 7 deletions hydra-cardano-api/hydra-cardano-api.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: hydra-cardano-api
version: 0.8.1
version: 0.9.0
synopsis: A Haskell API for Cardano, tailored to the Hydra project.
author: IOG
copyright: 2022 IOG
Expand Down Expand Up @@ -89,7 +89,6 @@ library
Hydra.Cardano.Api.NetworkId
Hydra.Cardano.Api.PlutusScript
Hydra.Cardano.Api.PlutusScriptVersion
Hydra.Cardano.Api.Point
Hydra.Cardano.Api.PolicyId
Hydra.Cardano.Api.Prelude
Hydra.Cardano.Api.ReferenceScript
Expand All @@ -100,7 +99,6 @@ library
Hydra.Cardano.Api.ScriptHash
Hydra.Cardano.Api.ScriptLanguageInEra
Hydra.Cardano.Api.ScriptWitnessInCtx
Hydra.Cardano.Api.SlotNo
Hydra.Cardano.Api.Tx
Hydra.Cardano.Api.TxBody
Hydra.Cardano.Api.TxId
Expand Down Expand Up @@ -143,10 +141,6 @@ library
, containers
, data-default
, hydra-prelude
, ouroboros-consensus
, ouroboros-consensus-byron
, ouroboros-consensus-cardano
, ouroboros-consensus-shelley
, ouroboros-network
, plutus-ledger-api
, QuickCheck
Expand Down
2 changes: 0 additions & 2 deletions hydra-cardano-api/src/Hydra/Cardano/Api.hs
Expand Up @@ -108,7 +108,6 @@ import Hydra.Cardano.Api.MultiAssetSupportedInEra as Extras
import Hydra.Cardano.Api.NetworkId ()
import Hydra.Cardano.Api.PlutusScript as Extras
import Hydra.Cardano.Api.PlutusScriptVersion as Extras
import Hydra.Cardano.Api.Point as Extras
import Hydra.Cardano.Api.PolicyId as Extras
import Hydra.Cardano.Api.ReferenceScript as Extras
import Hydra.Cardano.Api.ScriptData as Extras
Expand All @@ -117,7 +116,6 @@ import Hydra.Cardano.Api.ScriptDatum as Extras
import Hydra.Cardano.Api.ScriptHash as Extras
import Hydra.Cardano.Api.ScriptLanguageInEra as Extras
import Hydra.Cardano.Api.ScriptWitnessInCtx as Extras
import Hydra.Cardano.Api.SlotNo as Extras
import Hydra.Cardano.Api.Tx as Extras
import Hydra.Cardano.Api.TxBody as Extras
import Hydra.Cardano.Api.TxId as Extras
Expand Down
34 changes: 0 additions & 34 deletions hydra-cardano-api/src/Hydra/Cardano/Api/Point.hs

This file was deleted.

13 changes: 0 additions & 13 deletions hydra-cardano-api/src/Hydra/Cardano/Api/SlotNo.hs

This file was deleted.

5 changes: 4 additions & 1 deletion hydra-cardano-api/src/Hydra/Cardano/Api/TxOut.hs
Expand Up @@ -19,7 +19,6 @@ import Hydra.Cardano.Api.ReferenceTxInsScriptsInlineDatumsSupportedInEra (HasInl
import Hydra.Cardano.Api.ScriptData (toScriptData)
import Hydra.Cardano.Api.ScriptDataSupportedInEra (HasScriptData, scriptDataSupportedInEra)
import Hydra.Cardano.Api.Value (fromPlutusValue, minUTxOValue)
import Ouroboros.Consensus.Util (eitherToMaybe)
import Plutus.V2.Ledger.Api (OutputDatum (..), fromBuiltin)
import qualified Plutus.V2.Ledger.Api as Plutus

Expand Down Expand Up @@ -143,3 +142,7 @@ toPlutusTxOut =
-- constructing the Plutus.TxOut and hence we error out should it be used via
-- a 'Left', which we expect to throw away anyway on 'eitherToMaybe'.
eitherToMaybe . Ledger.txInfoOutV2 (error "TxOutSource used unexpectedly") . toLedgerTxOut
where
eitherToMaybe = \case
Left _ -> Nothing
Right x -> Just x
6 changes: 5 additions & 1 deletion hydra-node/test/Hydra/Chain/Direct/HandlersSpec.hs
Expand Up @@ -15,7 +15,6 @@ import qualified Data.Sequence.Strict as StrictSeq
import Hydra.Cardano.Api (
SlotNo (..),
Tx,
blockSlotNo,
toLedgerTx,
)
import Hydra.Chain (
Expand Down Expand Up @@ -271,6 +270,11 @@ genSequenceOfObservableBlocks = do
[] -> 1
x : _ -> SlotNo . succ . unSlotNo . blockSlotNo $ x

blockSlotNo pt =
case pointSlot (blockPoint pt) of
Origin -> 0
At sl -> sl

putNextBlock :: Tx -> StateT [Block] Gen ()
putNextBlock tx = do
sl <- nextSlot
Expand Down

0 comments on commit 70c14fe

Please sign in to comment.