Rebase fixes: need to squash

IntersectMBO · Dec 19, 2022 · a52fa5e · a52fa5e
1 parent cf93d69
commit a52fa5e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/cardano-api/src/Cardano/Api/Certificate.hs b/cardano-api/src/Cardano/Api/Certificate.hs
@@ -63,6 +63,7 @@ import qualified Cardano.Ledger.Shelley.TxBody as Shelley
 
 import           Cardano.Api.Address
 import           Cardano.Api.Hash
+import           Cardano.Api.HasTypeProxy
 import           Cardano.Api.Keys.Byron
 import           Cardano.Api.Keys.Praos
 import           Cardano.Api.Keys.Shelley

diff --git a/cardano-api/src/Cardano/Api/Keys/Byron.hs b/cardano-api/src/Cardano/Api/Keys/Byron.hs
@@ -53,6 +53,7 @@ import qualified Cardano.Crypto.Signing as Byron
 import qualified Cardano.Crypto.Wallet as Wallet
 
 import           Cardano.Api.Hash
+import           Cardano.Api.HasTypeProxy
 import           Cardano.Api.Keys.Class
 import           Cardano.Api.Keys.Shelley
 import           Cardano.Api.SerialiseCBOR

diff --git a/cardano-api/src/Cardano/Api/Keys/Praos.hs b/cardano-api/src/Cardano/Api/Keys/Praos.hs
@@ -36,7 +36,6 @@ import qualified Cardano.Ledger.Keys as Shelley
 
 import           Cardano.Api.Hash
 import           Cardano.Api.HasTypeProxy
-import           Cardano.Api.Key
 import           Cardano.Api.Keys.Class
 import           Cardano.Api.SerialiseBech32
 import           Cardano.Api.SerialiseCBOR

diff --git a/cardano-cli/test/data/golden/shelley/witnesses/singleSigningKeyWitness b/cardano-cli/test/data/golden/shelley/witnesses/singleSigningKeyWitness
@@ -1,5 +1,5 @@
 {
     "type": "TxWitness MaryEra",
-    "description": "",
-    "cborHex": "82008258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea42342758409f69aa4bf41acf78deaffb002c4f36157f3bad7c434a19b1ffe7e7df5f98f629e58503a762e83c1f60e54c9eb7eef9885b16c2b42ce1336914f2df9aa63b1407"
-}
+    "description": "Key Witness ShelleyEra",
+    "cborHex": "8258208dc60533b5dfa60a530955a696323a2ef4f14e8bc95a8f84cf6c441fea42342758409f69aa4bf41acf78deaffb002c4f36157f3bad7c434a19b1ffe7e7df5f98f629e58503a762e83c1f60e54c9eb7eef9885b16c2b42ce1336914f2df9aa63b1407"
+}