From b7e323e09dfda8716b3f4b96c32772ca2e7c0bf8 Mon Sep 17 00:00:00 2001
From: Sebastian Nagel <sebastian.nagel@ncoding.at>
Date: Thu, 9 Jun 2022 16:28:26 +0200
Subject: [PATCH] Expose Key interface in Cardano.Api.Shelley

Annoyingly I could not keep the explicit individual definitions + data
instances exported so needed to reach for (..) and deduplicate exports.
---
 cardano-api/src/Cardano/Api.hs                 | 11 ++---------
 cardano-api/src/Cardano/Api/Shelley.hs         |  2 ++
 cardano-cli/src/Cardano/CLI/Byron/Run.hs       |  2 +-
 cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs |  1 -
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs
index 3caa6b1f157..e303700522a 100644
--- a/cardano-api/src/Cardano/Api.hs
+++ b/cardano-api/src/Cardano/Api.hs
@@ -42,18 +42,12 @@ module Cardano.Api (
     AsType(..),
     -- * Cryptographic key interface
     -- $keys
-    Key,
-    VerificationKey,
+    Key(..),
     SigningKey(..),
-    getVerificationKey,
-    verificationKeyHash,
+    VerificationKey(..),
     castVerificationKey,
     castSigningKey,
-
-    -- ** Generating keys
     generateSigningKey,
-    deterministicSigningKey,
-    deterministicSigningKeySeedSize,
 
     -- ** Hashes
     -- | In Cardano most keys are identified by their hash, and hashes are
@@ -692,7 +686,6 @@ import           Cardano.Api.IPC
 import           Cardano.Api.IPC.Monad
 import           Cardano.Api.Key
 import           Cardano.Api.KeysByron
-import           Cardano.Api.KeysPraos
 import           Cardano.Api.KeysShelley
 import           Cardano.Api.LedgerEvent
 import           Cardano.Api.LedgerState
diff --git a/cardano-api/src/Cardano/Api/Shelley.hs b/cardano-api/src/Cardano/Api/Shelley.hs
index e9ebc79c2a6..aa71182b99d 100644
--- a/cardano-api/src/Cardano/Api/Shelley.hs
+++ b/cardano-api/src/Cardano/Api/Shelley.hs
@@ -12,6 +12,7 @@ module Cardano.Api.Shelley
 
     -- * Cryptographic key interface
     -- $keys
+    Key(..),
     VerificationKey(..),
     SigningKey(..),
 
@@ -235,6 +236,7 @@ import           Cardano.Api.InMode
 import           Cardano.Api.IPC
 import           Cardano.Api.KeysByron
 import           Cardano.Api.KeysPraos
+import           Cardano.Api.KeysByron
 import           Cardano.Api.KeysShelley
 import           Cardano.Api.LedgerState
 import           Cardano.Api.NetworkId
diff --git a/cardano-cli/src/Cardano/CLI/Byron/Run.hs b/cardano-cli/src/Cardano/CLI/Byron/Run.hs
index a6d1296e010..a96846e02a3 100644
--- a/cardano-cli/src/Cardano/CLI/Byron/Run.hs
+++ b/cardano-cli/src/Cardano/CLI/Byron/Run.hs
@@ -21,7 +21,7 @@ import qualified Cardano.Crypto.Hashing as Crypto
 import qualified Cardano.Crypto.Signing as Crypto
 
 import           Cardano.Api hiding (UpdateProposal, GenesisParameters)
-import           Cardano.Api.Byron (SomeByronSigningKey (..), Tx (..), VerificationKey (..))
+import           Cardano.Api.Byron (SomeByronSigningKey (..), Tx (..))
 
 import           Ouroboros.Consensus.Byron.Ledger (ByronBlock)
 import           Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr)
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs
index cf399e3dd68..606c79c97cc 100644
--- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs
+++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs
@@ -31,7 +31,6 @@ import qualified Cardano.Crypto.Wallet as Crypto
 import qualified Cardano.Ledger.Keys as Shelley
 
 import           Cardano.Api
-import           Cardano.Api.Byron hiding (SomeByronSigningKey (..))
 import qualified Cardano.Api.Byron as ByronApi
 import           Cardano.Api.Crypto.Ed25519Bip32 (xPrvFromBytes)
 import           Cardano.Api.Shelley