Skip to content

Commit 0db0560

Browse files
author
Jordan Millar
committed
Use exampleDijkstraGenesis value
1 parent 2d055d5 commit 0db0560

File tree

5 files changed

+5
-35
lines changed

5 files changed

+5
-35
lines changed

cardano-api/cardano-api.cabal

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ library
125125
cardano-data >=1.0,
126126
cardano-ledger-allegra >=1.7,
127127
cardano-ledger-alonzo >=1.13,
128-
cardano-ledger-api >=1.11,
128+
cardano-ledger-api:{cardano-ledger-api, testlib} >=1.11,
129129
cardano-ledger-babbage >=1.11,
130130
cardano-ledger-binary >=1.6,
131131
cardano-ledger-byron >=1.2,
132132
cardano-ledger-conway >=1.19,
133133
cardano-ledger-core:{cardano-ledger-core, testlib} >=1.17,
134-
cardano-ledger-dijkstra >= 0.1,
134+
cardano-ledger-dijkstra:{cardano-ledger-dijkstra} >= 0.1,
135135
cardano-ledger-mary >=1.8,
136136
cardano-ledger-shelley >=1.16,
137137
cardano-protocol-tpraos >=1.4,
@@ -296,7 +296,6 @@ library gen
296296
Test.Gen.Cardano.Api.Era
297297
Test.Gen.Cardano.Api.Hardcoded
298298
Test.Gen.Cardano.Api.Metadata
299-
Test.Gen.Cardano.Api.Orphans
300299
Test.Gen.Cardano.Api.ProtocolParameters
301300
Test.Gen.Cardano.Api.Typed
302301
Test.Gen.Cardano.Crypto.Seed
@@ -317,11 +316,9 @@ library gen
317316
cardano-ledger-byron-test >=1.5,
318317
cardano-ledger-conway:testlib,
319318
cardano-ledger-core:{cardano-ledger-core, testlib} >=1.14,
320-
cardano-ledger-dijkstra >=0.1,
321319
cardano-ledger-shelley >=1.13,
322320
containers,
323321
filepath,
324-
generic-random,
325322
hedgehog >=1.1,
326323
hedgehog-extras,
327324
hedgehog-quickcheck,
@@ -345,7 +342,6 @@ test-suite cardano-api-test
345342
cardano-binary,
346343
cardano-crypto,
347344
cardano-crypto-class ^>=2.2.1,
348-
cardano-crypto-test ^>=1.6,
349345
cardano-crypto-tests ^>=2.2,
350346
cardano-ledger-alonzo,
351347
cardano-ledger-api >=1.9,

cardano-api/gen/Test/Gen/Cardano/Api/Era.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import Cardano.Ledger.Core qualified as Ledger
1717

1818
import Data.Functor.Identity qualified as Ledger
1919

20-
import Test.Gen.Cardano.Api.Orphans ()
21-
2220
import Test.Cardano.Ledger.Conway.Arbitrary ()
2321
import Test.Cardano.Ledger.Core.Arbitrary ()
2422

cardano-api/gen/Test/Gen/Cardano/Api/Orphans.hs

Lines changed: 0 additions & 24 deletions
This file was deleted.

cardano-api/src/Cardano/Api/LedgerState.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ import Cardano.Ledger.BaseTypes qualified as Ledger
159159
import Cardano.Ledger.Binary (DecoderError)
160160
import Cardano.Ledger.Coin qualified as SL
161161
import Cardano.Ledger.Conway.Genesis (ConwayGenesis (..))
162-
import Cardano.Ledger.Dijkstra.Genesis
163162
import Cardano.Ledger.Keys qualified as SL
164163
import Cardano.Ledger.Shelley.API qualified as ShelleyAPI
165164
import Cardano.Ledger.Shelley.Core qualified as Core
@@ -208,6 +207,7 @@ import Ouroboros.Network.Block qualified
208207
import Ouroboros.Network.Protocol.ChainSync.Client qualified as CS
209208
import Ouroboros.Network.Protocol.ChainSync.ClientPipelined qualified as CSP
210209
import Ouroboros.Network.Protocol.ChainSync.PipelineDecision
210+
import Test.Cardano.Ledger.Api.Examples.Consensus.Dijkstra
211211

212212
import Control.Concurrent
213213
import Control.DeepSeq
@@ -1496,7 +1496,7 @@ readCardanoGenesisConfig mEra enc = do
14961496
ShelleyConfig shelleyGenesis shelleyGenesisHash <- readShelleyGenesisConfig enc
14971497
alonzoGenesis <- readAlonzoGenesisConfig mEra enc
14981498
conwayGenesis <- readConwayGenesisConfig enc
1499-
let dijkstraGenesis = DijkstraGenesis $ error "dijkstra"
1499+
let dijkstraGenesis = exampleDijkstraGenesis -- TODO: Dijkstra - add plumbing to read Dijkstra genesis
15001500
let transCfg = Ledger.mkLatestTransitionConfig shelleyGenesis alonzoGenesis conwayGenesis dijkstraGenesis
15011501
pure $ GenesisCardano enc byronGenesis shelleyGenesisHash transCfg
15021502

cardano-api/test/cardano-api-test/Test/Cardano/Api/Orphans.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module Test.Cardano.Api.Orphans () where
99
import Cardano.Api.Byron
1010
import Cardano.Api.Key
1111

12-
import Test.Cardano.Crypto.Orphans ()
12+
--import Test.Cardano.Crypto.Orphans ()
1313

1414
-- Signing Key instances
1515

0 commit comments

Comments
 (0)