Skip to content

Commit 3f2af3d

Browse files
committed
Migrate to cardano-api 11.2.0.0 Certificate API
cardano-api #1210 removed the legacy 'Cardano.Api.Certificate' module and stopped re-exporting Certificate-construction helpers from 'Cardano.Api'. Migrate cardano-cli to import the relevant types ('StakePoolRelay', 'StakePoolMetadataReference', 'StakePoolMetadata', 'DRepMetadata', 'KESPeriod', 'OperationalCertificate', 'OperationalCertificateIssueCounter', 'PoolId', 'StakePoolParameters', helpers like 'issueOperationalCertificate', 'validateAndHashStakePoolMetadata', 'toShelleyPoolParams', 'hashDRepMetadata', 'getKesPeriod', 'getOpCertCount', data instances 'Hash StakePoolMetadataHash' / 'Hash DRepMetadataHash', 'AsType AsOperationalCertificate' / 'AsType AsOperationalCertificateIssueCounter', 'MIRPot') from 'Cardano.Api.Experimental.Certificate' or 'Cardano.Api.Compatible.Certificate' as appropriate. Drops vacuous 'hiding (make*Certificate)' / 'hiding (Certificate)' clauses that referenced names no longer re-exported from 'Cardano.Api', which had become '-Wdodgy-imports' errors under '-Werror'. Removes the redundant 'Cardano.Ledger.Core' qualified import from 'Cardano.CLI.Read' that became unused after the cardano-api re-export narrowing.
1 parent 966f30b commit 3f2af3d

29 files changed

Lines changed: 70 additions & 25 deletions

File tree

cardano-cli/src/Cardano/CLI/Compatible/Governance/Command.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ module Cardano.CLI.Compatible.Governance.Command
88
where
99

1010
import Cardano.Api
11+
import Cardano.Api.Compatible.Certificate (MIRPot)
1112

1213
import Cardano.CLI.Compatible.Governance.Types
1314
import Cardano.CLI.EraBased.Governance.Option

cardano-cli/src/Cardano/CLI/Compatible/StakeAddress/Run.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Cardano.CLI.Compatible.StakeAddress.Run
1010
)
1111
where
1212

13-
import Cardano.Api hiding (makeStakeAddressRegistrationCertificate)
13+
import Cardano.Api
1414
import Cardano.Api.Compatible.Certificate
1515
import Cardano.Api.Experimental qualified as Exp
1616
import Cardano.Api.Ledger qualified as L

cardano-cli/src/Cardano/CLI/Compatible/StakePool/Command.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module Cardano.CLI.Compatible.StakePool.Command
1010
where
1111

1212
import Cardano.Api
13+
import Cardano.Api.Experimental.Certificate (StakePoolMetadataReference, StakePoolRelay)
1314

1415
import Cardano.CLI.Type.Common
1516
import Cardano.CLI.Type.Key

cardano-cli/src/Cardano/CLI/Compatible/StakePool/Run.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ module Cardano.CLI.Compatible.StakePool.Run
99
)
1010
where
1111

12-
import Cardano.Api hiding (makeStakePoolRegistrationCertificate)
12+
import Cardano.Api
1313
import Cardano.Api.Compatible.Certificate
1414
import Cardano.Api.Experimental qualified as Exp
15+
import Cardano.Api.Experimental.Certificate (StakePoolParameters (..), toShelleyPoolParams)
1516

1617
import Cardano.CLI.Compatible.Exception
1718
import Cardano.CLI.Compatible.StakePool.Command

cardano-cli/src/Cardano/CLI/EraBased/Common/Option.hs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ module Cardano.CLI.EraBased.Common.Option where
1111

1212
import Cardano.Api
1313
import Cardano.Api.Experimental as Exp
14+
import Cardano.Api.Experimental.Certificate
15+
( KESPeriod (..)
16+
, StakePoolMetadata
17+
, StakePoolMetadataReference (..)
18+
, StakePoolRelay (..)
19+
)
1420
import Cardano.Api.Ledger qualified as L
1521
import Cardano.Api.Network qualified as Consensus
1622
import Cardano.Api.Parser.Text qualified as P

cardano-cli/src/Cardano/CLI/EraBased/Genesis/CreateTestnetData/Run.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ module Cardano.CLI.EraBased.Genesis.CreateTestnetData.Run
2626
where
2727

2828
import Cardano.Api hiding (ConwayEra)
29+
import Cardano.Api.Experimental.Certificate
30+
( KESPeriod (..)
31+
, OperationalCertificateIssueCounter (..)
32+
)
2933
import Cardano.Api.Ledger (StandardCrypto, StrictMaybe (SNothing))
3034
import Cardano.Api.Ledger qualified as L
3135

cardano-cli/src/Cardano/CLI/EraBased/Genesis/Run.hs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ import Cardano.Api.Byron
3434
, SigningKey (..)
3535
)
3636
import Cardano.Api.Byron qualified as Byron hiding (SigningKey)
37+
import Cardano.Api.Experimental.Certificate
38+
( KESPeriod (..)
39+
, OperationalCertificate
40+
, OperationalCertificateIssueCounter (..)
41+
, issueOperationalCertificate
42+
)
3743
import Cardano.Api.Ledger qualified as L
3844

3945
import Cardano.CLI.Byron.Delegation

cardano-cli/src/Cardano/CLI/EraBased/Governance/Committee/Run.hs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ module Cardano.CLI.EraBased.Governance.Committee.Run
1313
)
1414
where
1515

16-
import Cardano.Api hiding
17-
( Certificate
18-
, makeCommitteeColdkeyResignationCertificate
19-
, makeCommitteeHotKeyAuthorizationCertificate
20-
)
16+
import Cardano.Api
2117
import Cardano.Api.Experimental
2218
( Certificate
2319
, Era

cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Command.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ where
1818

1919
import Cardano.Api
2020
import Cardano.Api.Experimental qualified as Exp
21+
import Cardano.Api.Experimental.Certificate (DRepMetadata)
2122
import Cardano.Api.Ledger qualified as L
2223

2324
import Cardano.CLI.EraIndependent.Hash.Command (HashGoal)

cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Option.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ where
99

1010
import Cardano.Api
1111
import Cardano.Api.Experimental qualified as Exp
12+
import Cardano.Api.Experimental.Certificate (DRepMetadata, Hash (DRepMetadataHash))
1213
import Cardano.Api.Ledger qualified as L
1314

1415
import Cardano.CLI.EraBased.Common.Option

0 commit comments

Comments
 (0)