Move AccountState to Cardano.Ledger.State from cardano-ledger-shelley

Author: lehins

eras/shelley/impl/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.16.0.0
 
+* Move `AccountState` to `Cardano.Ledger.State`
 * Deprecated `RewardAccounts`
 * Deprecated `utxosUtxoL`
 * Added `CanGetUTxO` and `CanSetUTxO` instances for `EpochState`, `UTxOState`, `NewEpochState`, `LedgerState` 

eras/shelley/impl/src/Cardano/Ledger/Shelley/AdaPots.hs

@@ -33,15 +33,14 @@ import Cardano.Ledger.Compactible (fromCompact)
 import Cardano.Ledger.Core
 import Cardano.Ledger.Shelley.Governance (EraGov (..))
 import Cardano.Ledger.Shelley.LedgerState.Types (
-  AccountState (..),
   EpochState (..),
   LedgerState (..),
   UTxOState (..),
   lsUTxOStateL,
   utxosGovStateL,
  )
 import Cardano.Ledger.Shelley.TxBody (unWithdrawals)
-import Cardano.Ledger.State (UTxO (..), coinBalance, txInsFilter, txouts)
+import Cardano.Ledger.State
 import Cardano.Ledger.UMap (sumRewardsUView)
 import Control.DeepSeq (NFData)
 import Data.Foldable (fold)

eras/shelley/impl/src/Cardano/Ledger/Shelley/LedgerState.hs

@@ -154,17 +154,4 @@ import Cardano.Ledger.Shelley.PParams (pvCanFollow)
 import Cardano.Ledger.Shelley.RewardUpdate
 import Cardano.Ledger.Shelley.Rules.Ppup (ShelleyGovState (..))
 import Cardano.Ledger.Shelley.UTxO (consumed, produced)
-import Cardano.Ledger.State (
-  CanGetUTxO (..),
-  CanSetUTxO (..),
-  UTxO (..),
-  ssDelegationsL,
-  ssFeeL,
-  ssPoolParamsL,
-  ssStakeDistrL,
-  ssStakeGoL,
-  ssStakeL,
-  ssStakeMarkL,
-  ssStakeMarkPoolDistrL,
-  ssStakeSetL,
- )
+import Cardano.Ledger.State

eras/shelley/impl/src/Cardano/Ledger/Shelley/LedgerState/IncrementalStake.hs

@@ -56,7 +56,7 @@ import Cardano.Ledger.Shelley.Rewards (
   aggregateRewards,
   filterRewards,
  )
-import Cardano.Ledger.State (SnapShot (..), Stake (..), UTxO (..))
+import Cardano.Ledger.State
 import Cardano.Ledger.UMap (
   UMElem,
   UMap (..),

eras/shelley/impl/src/Cardano/Ledger/Shelley/LedgerState/NewEpochState.hs

@@ -24,7 +24,7 @@ import Cardano.Ledger.Coin (Coin (..), addDeltaCoin)
 import Cardano.Ledger.Keys (GenDelegPair (..), GenDelegs (..))
 import Cardano.Ledger.Shelley.Core
 import Cardano.Ledger.Shelley.LedgerState.Types
-import Cardano.Ledger.State (UTxO (..), coinBalance)
+import Cardano.Ledger.State
 import qualified Cardano.Ledger.UMap as UM
 import Cardano.Ledger.Val ((<+>), (<->))
 import Data.Default (def)

eras/shelley/impl/src/Cardano/Ledger/Shelley/LedgerState/PulsingReward.hs

@@ -73,13 +73,7 @@ import Cardano.Ledger.Shelley.Rewards (
   sumRewards,
  )
 import Cardano.Ledger.Slot (EpochSize (..))
-import Cardano.Ledger.State (
-  SnapShot (..),
-  SnapShots (..),
-  Stake (..),
-  sumAllStake,
-  sumStakePerPool,
- )
+import Cardano.Ledger.State
 import qualified Cardano.Ledger.UMap as UM
 import Cardano.Ledger.Val ((<->))
 import Data.Group (invert)

eras/shelley/impl/src/Cardano/Ledger/Shelley/LedgerState/Types.hs

@@ -65,15 +65,7 @@ import Cardano.Ledger.Shelley.Core
 import Cardano.Ledger.Shelley.Era (ShelleyEra)
 import Cardano.Ledger.Shelley.PoolRank (NonMyopic (..))
 import Cardano.Ledger.Shelley.RewardUpdate (PulsingRewUpdate (..))
-import Cardano.Ledger.State (
-  CanGetUTxO (..),
-  CanSetUTxO (..),
-  PoolDistr (..),
-  SnapShots (..),
-  UTxO (..),
-  ssStakeDistrL,
-  ssStakeMarkL,
- )
+import Cardano.Ledger.State
 import Cardano.Ledger.UMap (UMap (..))
 import Control.DeepSeq (NFData)
 import Control.Monad.State.Strict (evalStateT)
@@ -96,35 +88,6 @@ type RewardAccounts =
   Map (Credential 'Staking) Coin
 {-# DEPRECATED RewardAccounts "In favor of `Map` (`Credential` `Staking`) `Coin`" #-}
 
-data AccountState = AccountState
-  { asTreasury :: !Coin
-  , asReserves :: !Coin
-  }
-  deriving (Show, Eq, Generic)
-
-instance EncCBOR AccountState where
-  encCBOR (AccountState t r) =
-    encodeListLen 2 <> encCBOR t <> encCBOR r
-
-instance DecCBOR AccountState where
-  decCBOR =
-    decodeRecordNamed "AccountState" (const 2) $ AccountState <$> decCBOR <*> decCBOR
-
-instance ToJSON AccountState where
-  toJSON = object . toAccountStatePairs
-  toEncoding = pairs . mconcat . toAccountStatePairs
-
-toAccountStatePairs :: KeyValue e a => AccountState -> [a]
-toAccountStatePairs as@(AccountState _ _) =
-  let AccountState {asTreasury, asReserves} = as
-   in [ "treasury" .= asTreasury
-      , "reserves" .= asReserves
-      ]
-
-instance NoThunks AccountState
-
-instance NFData AccountState
-
 data EpochState era = EpochState
   { esAccountState :: !AccountState
   , esLState :: !(LedgerState era)
@@ -607,9 +570,6 @@ instance
 instance Default (UTxOState era) => Default (LedgerState era) where
   def = LedgerState def def
 
-instance Default AccountState where
-  def = AccountState (Coin 0) (Coin 0)
-
 -- =============================================================
 -- Lenses for types found inside NewEpochState and its fields
 

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

@@ -203,10 +203,6 @@ instance
   -- > instance OVERLAPPING_ GSubtermsIncl (K1 i a) b where
   shrink = recursivelyShrink
 
-instance Arbitrary AccountState where
-  arbitrary = AccountState <$> arbitrary <*> arbitrary
-  shrink = genericShrink
-
 instance Arbitrary IncrementalStake where
   arbitrary = IStake <$> arbitrary <*> pure mempty -- Once in Conway Ptrs Map will be removed
   shrink = genericShrink

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

@@ -126,7 +126,6 @@ instance ToExpr PulsingRewUpdate where
 instance ToExpr RewardUpdate
 
 -- LedgerState/Types
-instance ToExpr AccountState
 
 instance
   ( ToExpr (TxOut era)

libs/cardano-ledger-core/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.17.0.0
 
+* Move `AccountState` to `Cardano.Ledger.State` from `cardano-ledger-shelley`
 * Move `Cardano.Ledger.PoolDistr` module contents into `Cardano.Ledger.State` and deprecated the former
 * Move `Cardano.Ledger.SnapShots` module contents into `Cardano.Ledger.State` and deprecated the former
 * Move `Cardano.Ledger.UTxO` module contents into `Cardano.Ledger.State` and deprecated the former