Fix freshAddr

Author: Soupstraw

eras/shelley/impl/testlib/Test/Cardano/Ledger/Shelley/ImpTest.hs

@@ -1492,20 +1492,23 @@ freshKeyPair = do
 
 -- | Generate a random `Addr` that uses a `KeyHash`, and add the corresponding `KeyPair`
 -- to the known keys in the Imp state.
-freshKeyAddr_ ::
-  (HasKeyPairs s, MonadState s m, HasStatefulGen g m, MonadGen m) => m Addr
+freshKeyAddr_ :: EraGov era => ImpTestM era Addr
 freshKeyAddr_ = snd <$> freshKeyAddr
 
 -- | Generate a random `Addr` that uses a `KeyHash`, add the corresponding `KeyPair`
 -- to the known keys in the Imp state, and return the `KeyHash` as well as the `Addr`.
-freshKeyAddr ::
-  (HasKeyPairs s, MonadState s m, HasStatefulGen g m, MonadGen m) =>
-  m (KeyHash Payment, Addr)
+freshKeyAddr :: EraGov era => ImpTestM era (KeyHash Payment, Addr)
 freshKeyAddr = do
+  ProtVer pv _ <- getProtVer
   paymentKeyHash <- freshKeyHash @Payment
   stakingKeyHash <-
-    oneof
-      [Just . mkStakeRef <$> freshKeyHash @Staking, Just . mkStakeRef @Ptr <$> arbitrary, pure Nothing]
+    oneof $
+      [ Just . mkStakeRef <$> freshKeyHash @Staking
+      , pure Nothing
+      ]
+        <> [ Just . mkStakeRef @Ptr <$> arbitrary
+           | pv < natVersion @12
+           ]
   pure (paymentKeyHash, mkAddr paymentKeyHash stakingKeyHash)
 
 -- | Looks up the keypair corresponding to the `BootstrapAddress`. The `BootstrapAddress`

libs/cardano-ledger-conformance/test/Test/Cardano/Ledger/Conformance/Imp/Core.hs

@@ -16,7 +16,7 @@ import Cardano.Ledger.Conway.Governance
 import Cardano.Ledger.Conway.Rules
 import Cardano.Ledger.Core
 import Cardano.Ledger.Shelley.LedgerState
-import Cardano.Ledger.Shelley.Rules (UtxoEnv (..), ledgerSlotNoL)
+import Cardano.Ledger.Shelley.Rules (ledgerSlotNoL)
 import Cardano.Ledger.TxIn (TxId)
 import Control.State.Transition
 import Data.Bifunctor (Bifunctor (..))