Regenerate ledger state golden files.

Ledger state format has changed again, so this is expected.
IntersectMBO · Jan 27, 2022 · 6a38014 · 6a38014
1 parent 2ab703e
commit 6a38014
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 0 deletions.
diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Allegra b/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Allegra
diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Alonzo b/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Alonzo
diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Mary b/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Mary
diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Shelley b/ouroboros-consensus-cardano-test/test/golden/disk/ExtLedgerState_Shelley
diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Allegra b/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Allegra
diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Alonzo b/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Alonzo
diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Mary b/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Mary
diff --git a/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Shelley b/ouroboros-consensus-cardano-test/test/golden/disk/LedgerState_Shelley
diff --git a/ouroboros-consensus-shelley-test/test/golden/disk/ExtLedgerState b/ouroboros-consensus-shelley-test/test/golden/disk/ExtLedgerState
diff --git a/ouroboros-consensus-shelley-test/test/golden/disk/LedgerState b/ouroboros-consensus-shelley-test/test/golden/disk/LedgerState
diff --git a/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node.hs b/ouroboros-consensus-shelley/src/Ouroboros/Consensus/Shelley/Node.hs
@@ -516,9 +516,12 @@ registerGenesisStaking staking nes = nes {
         -- 1. Add the initial UTxO, whilst deleting nothing.
         -- 2. Update the stake map given the initial delegation.
         SL.incrementalStakeDistr
+<<<<<<< HEAD
           -- Note that 'updateStakeDistribution' takes first the set of UTxO to
           -- delete, and then the set to add. In our case, there is nothing to
           -- delete, since this is an initial UTxO set.
+=======
+>>>>>>> 5beaf61f1 (Regenerate ledger state golden files.)
           (SL.updateStakeDistribution mempty mempty (SL._utxo (SL._utxoState ledgerState)))
           dState'
           pState'