Merge branch 'IntersectMBO#5132-1.35-backport' into release/1.35

CardanoSolutions · Apr 25, 2023 · 7f43360 · 7f43360
2 parents f51d277 + 75e31ee
commit 7f43360
Show file tree

Hide file tree

Showing 28 changed files with 255 additions and 522 deletions.
diff --git a/cardano-api/gen/Gen/Cardano/Api/Typed.hs b/cardano-api/gen/Gen/Cardano/Api/Typed.hs
@@ -63,15 +63,14 @@ module Gen.Cardano.Api.Typed
 
   , genGovernancePoll
   , genGovernancePollAnswer
-  , genGovernancePollWitness
   ) where
 
 import           Cardano.Api hiding (txIns)
 import qualified Cardano.Api as Api
 import           Cardano.Api.Byron (KeyWitness (ByronKeyWitness),
                    WitnessNetworkIdOrByronAddress (..))
 import           Cardano.Api.Shelley (Hash (..), KESPeriod (KESPeriod),
-                   GovernancePoll (..), GovernancePollAnswer (..), GovernancePollWitness (..),
+                   GovernancePoll (..), GovernancePollAnswer (..),
                    OperationalCertificateIssueCounter (OperationalCertificateIssueCounter),
                    PlutusScript (PlutusScriptSerialised), ProtocolParameters (ProtocolParameters),
                    ReferenceScript (..), ReferenceTxInsScriptsInlineDatumsSupportedInEra (..),
@@ -88,10 +87,8 @@ import           Data.String
 import qualified Data.Text as Text
 
 import qualified Cardano.Binary as CBOR
-import qualified Cardano.Crypto.DSIGN as DSIGN
 import qualified Cardano.Crypto.Hash as Crypto
 import qualified Cardano.Crypto.Seed as Crypto
-import qualified Cardano.Crypto.VRF as VRF
 import qualified Cardano.Ledger.Shelley.TxBody as Ledger (EraIndependentTxBody)
 import qualified PlutusCore as Plutus
 
@@ -103,7 +100,6 @@ import qualified Cardano.Crypto.Hash.Class as CRYPTO
 import           Cardano.Ledger.Alonzo.Language (Language (..))
 import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
 import           Cardano.Ledger.SafeHash (unsafeMakeSafeHash)
-import           Cardano.Ledger.Keys (VKey(..))
 
 import           Gen.Cardano.Api.Metadata (genTxMetadata)
 import           Test.Cardano.Chain.UTxO.Gen (genVKWitness)
@@ -903,32 +899,3 @@ genGovernancePollAnswer =
  where
    genGovernancePollHash =
      GovernancePollHash . mkDummyHash <$> Gen.int (Range.linear 0 10)
-
-genGovernancePollWitness :: Gen GovernancePollWitness
-genGovernancePollWitness =
-  Gen.choice
-    [ GovernancePollWitnessVRF
-        <$> fmap
-              unsafeDeserialiseVerKeyVRF
-              (Gen.bytes $ Range.singleton 32)
-        <*> fmap
-              unsafeDeserialiseCertVRF
-              (Gen.bytes $ Range.singleton 80)
-    , GovernancePollWitnessColdKey
-        <$> fmap
-              (VKey . unsafeDeserialiseVerKeyDSIGN)
-              (Gen.bytes $ Range.singleton 32)
-        <*> fmap
-              (DSIGN.SignedDSIGN . unsafeDeserialiseSigDSIGN)
-              (Gen.bytes $ Range.singleton 64)
-    ]
- where
-  unsafeDeserialiseVerKeyVRF =
-    fromMaybe (panic "unsafeDeserialiseVerKeyVRF") . VRF.rawDeserialiseVerKeyVRF
-  unsafeDeserialiseCertVRF =
-    fromMaybe (panic "unsafeDeserialiseCertVRF") . VRF.rawDeserialiseCertVRF
-
-  unsafeDeserialiseVerKeyDSIGN =
-    fromMaybe (panic "unsafeDeserialiseVerKeyDSIGN") . DSIGN.rawDeserialiseVerKeyDSIGN
-  unsafeDeserialiseSigDSIGN =
-    fromMaybe (panic "unsafeDeserialiseSigDSIGN") . DSIGN.rawDeserialiseSigDSIGN