Skip to content

Commit c3af38d

Browse files
committed
More integration
1 parent 04b4c33 commit c3af38d

15 files changed

+3
-10
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/CanHardFork.hs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import qualified Cardano.Ledger.Era as SL
3636
import Cardano.Ledger.Hashes (EraIndependentTxBody)
3737
import Cardano.Ledger.Keys (DSignable, Hash)
3838
import qualified Cardano.Ledger.Shelley.API as SL
39-
import qualified Cardano.Ledger.Shelley.Governance as SL
4039
import qualified Cardano.Ledger.Shelley.LedgerState as SL
4140
import Cardano.Ledger.Shelley.Translation
4241
(toFromByronTranslationContext)
@@ -61,7 +60,7 @@ import qualified Data.SOP.Tails as Tails
6160
import Data.Void
6261
import Data.Word
6362
import GHC.Generics (Generic)
64-
import Lens.Micro (Lens', (.~))
63+
import Lens.Micro ((.~))
6564
import Lens.Micro.Extras (view)
6665
import NoThunks.Class (NoThunks)
6766
import Ouroboros.Consensus.Block
@@ -727,17 +726,11 @@ translateLedgerStateBabbageToConwayWrapper =
727726
-> LedgerState (ShelleyBlock proto (BabbageEra c))
728727
patchGovState st =
729728
st { shelleyLedgerState = shelleyLedgerState st
730-
& newEpochStateGovStateL .~ newGovState
729+
& SL.newEpochStateGovStateL .~ newGovState
731730
}
732731
where
733-
-- next ledger release already provides this
734-
newEpochStateGovStateL ::
735-
Lens' (SL.NewEpochState era) (SL.GovState era)
736-
newEpochStateGovStateL =
737-
SL.nesEsL . SL.esLStateL . SL.lsUTxOStateL . SL.utxosGovStateL
738-
739732
newGovState =
740-
view newEpochStateGovStateL
733+
view SL.newEpochStateGovStateL
741734
. tickedShelleyLedgerState
742735
. applyChainTick
743736
(unwrapLedgerConfig cfgBabbage)

0 commit comments

Comments
 (0)