Merge pull request #5297 from IntersectMBO/aniketd/remove-umap

Remove UMap

Author: lehins

eras/allegra/impl/testlib/Test/Cardano/Ledger/Allegra/Era.hs

@@ -29,8 +29,6 @@ instance EraTest AllegraEra where
 
   accountsFromAccountsMap = shelleyAccountsFromAccountsMap
 
-  accountsToUMap = shelleyAccountsToUMap
-
 instance ShelleyEraTest AllegraEra
 
 instance AllegraEraTest AllegraEra

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Era.hs

@@ -42,8 +42,6 @@ instance EraTest AlonzoEra where
 
   accountsFromAccountsMap = shelleyAccountsFromAccountsMap
 
-  accountsToUMap = shelleyAccountsToUMap
-
 instance ShelleyEraTest AlonzoEra
 
 instance AllegraEraTest AlonzoEra

eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/Era.hs

@@ -31,8 +31,6 @@ instance EraTest BabbageEra where
 
   accountsFromAccountsMap = shelleyAccountsFromAccountsMap
 
-  accountsToUMap = shelleyAccountsToUMap
-
 instance ShelleyEraTest BabbageEra
 
 instance AllegraEraTest BabbageEra

eras/conway/impl/CHANGELOG.md

@@ -7,6 +7,10 @@
   - Add `hardforkConwayMoveWithdrawalsAndDRepChecksToLedgerRule` to `Conway.Era`.
   - Add `updateDormantDRepExpiries`  and `updateVotingDRepExpiries`
 
+### `testlib`
+
+* Remove `conwayAccountsToUMap` corresponding to the removal of `UMap` from core.
+
 ## 1.20.0.0
 
 * Decoupled `ConwayEraTxCert` from `ShelleyEraTxCert`, so added `ShelleyEraTxCert` constraint to:

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Era.hs

@@ -7,21 +7,16 @@ module Test.Cardano.Ledger.Conway.Era (
   module Test.Cardano.Ledger.Babbage.Era,
   ConwayEraTest,
   mkConwayTestAccountState,
-  conwayAccountsToUMap,
 ) where
 
 import Cardano.Ledger.Alonzo.Plutus.Context (EraPlutusTxInfo)
-import Cardano.Ledger.BaseTypes
 import Cardano.Ledger.Coin
 import Cardano.Ledger.Conway
 import Cardano.Ledger.Conway.Core
 import Cardano.Ledger.Conway.Governance
 import Cardano.Ledger.Conway.State
 import Cardano.Ledger.Plutus (Language (..))
-import Cardano.Ledger.UMap
 import Data.Coerce
-import qualified Data.Map.Strict as Map
-import qualified Data.Set as Set
 import Lens.Micro
 import Test.Cardano.Ledger.Babbage.Era
 import Test.Cardano.Ledger.Conway.Arbitrary ()
@@ -45,8 +40,6 @@ instance EraTest ConwayEra where
 
   accountsFromAccountsMap = coerce
 
-  accountsToUMap = conwayAccountsToUMap
-
 instance ShelleyEraTest ConwayEra
 
 instance AllegraEraTest ConwayEra
@@ -71,17 +64,3 @@ mkConwayTestAccountState deposit mStakePool mDRep =
   mkConwayAccountState deposit
     & stakePoolDelegationAccountStateL .~ mStakePool
     & dRepDelegationAccountStateL .~ mDRep
-
-conwayAccountsToUMap :: ConwayEraAccounts era => Accounts era -> UMap
-conwayAccountsToUMap accounts =
-  UMap
-    { umElems = Map.map toUMElem (accounts ^. accountsMapL)
-    , umPtrs = Map.empty
-    }
-  where
-    toUMElem accountState =
-      UMElem
-        (SJust (RDPair (accountState ^. balanceAccountStateL) (accountState ^. depositAccountStateL)))
-        Set.empty
-        (maybeToStrictMaybe (accountState ^. stakePoolDelegationAccountStateL))
-        (maybeToStrictMaybe (accountState ^. dRepDelegationAccountStateL))

eras/dijkstra/impl/testlib/Test/Cardano/Ledger/Dijkstra/Era.hs

@@ -22,8 +22,6 @@ instance EraTest DijkstraEra where
 
   accountsFromAccountsMap = coerce
 
-  accountsToUMap = conwayAccountsToUMap
-
 class
   ConwayEraTest era =>
   DijkstraEraTest era

eras/mary/impl/testlib/Test/Cardano/Ledger/Mary/Era.hs

@@ -26,8 +26,6 @@ instance EraTest MaryEra where
 
   accountsFromAccountsMap = shelleyAccountsFromAccountsMap
 
-  accountsToUMap = shelleyAccountsToUMap
-
 instance ShelleyEraTest MaryEra
 
 instance AllegraEraTest MaryEra

eras/shelley/impl/CHANGELOG.md

@@ -91,6 +91,7 @@
 
 ### `testlib`
 
+* Remove `shelleyAccountsToUMap` corresponding to the removal of `UMap` from core.
 * Added `impSatisfySignature` and `impSatisfyMNativeScripts`
 * Added `EraSpecificSpec ShelleyEra` instance
 * Added `EraSpecificSpec` class

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

@@ -13,10 +13,8 @@ module Test.Cardano.Ledger.Shelley.Era (
   nativeAlwaysFails,
   nativeAlwaysSucceeds,
   shelleyAccountsFromAccountsMap,
-  shelleyAccountsToUMap,
 ) where
 
-import Cardano.Ledger.BaseTypes
 import Cardano.Ledger.Coin
 import Cardano.Ledger.Core
 import Cardano.Ledger.Credential
@@ -26,10 +24,8 @@ import Cardano.Ledger.Shelley.LedgerState
 import Cardano.Ledger.Shelley.Scripts
 import Cardano.Ledger.Shelley.State
 import Cardano.Ledger.Shelley.Transition
-import Cardano.Ledger.UMap
 import Data.Default
 import qualified Data.Map.Strict as Map
-import qualified Data.Set as Set
 import Lens.Micro
 import Test.Cardano.Ledger.Common
 import Test.Cardano.Ledger.Era
@@ -58,8 +54,6 @@ instance EraTest ShelleyEra where
 
   accountsFromAccountsMap = shelleyAccountsFromAccountsMap
 
-  accountsToUMap = shelleyAccountsToUMap
-
 instance ShelleyEraTest ShelleyEra
 
 mkShelleyTestAccountState ::
@@ -91,20 +85,6 @@ shelleyAccountsFromAccountsMap accountsMap =
           [(accountState ^. ptrAccountStateG, cred) | (cred, accountState) <- Map.toList accountsMap]
     }
 
-shelleyAccountsToUMap :: ShelleyEraAccounts era => Accounts era -> UMap
-shelleyAccountsToUMap accounts =
-  UMap
-    { umElems = Map.map toUMElem (accounts ^. accountsMapL)
-    , umPtrs = accounts ^. accountsPtrsMapG
-    }
-  where
-    toUMElem accountState =
-      UMElem
-        (SJust (RDPair (accountState ^. balanceAccountStateL) (accountState ^. depositAccountStateL)))
-        (Set.singleton (accountState ^. ptrAccountStateG))
-        (maybeToStrictMaybe (accountState ^. stakePoolDelegationAccountStateL))
-        SNothing
-
 -- Minimal native scripts that can be used in all post-Shelley eras
 
 nativeAlwaysFails :: forall era. ShelleyEraScript era => Script era

hie.yaml

@@ -243,9 +243,6 @@ cradle:
     - path: "libs/cardano-ledger-core/test"
       component: "cardano-ledger-core:test:tests"
 
-    - path: "libs/cardano-ledger-core/bench/UMap.hs"
-      component: "cardano-ledger-core:bench:umap"
-
     - path: "libs/cardano-ledger-core/bench/Addr.hs"
       component: "cardano-ledger-core:bench:addr"