Merge #2115

2115: Update ouroboros-network r=newhoggy a=newhoggy Co-authored-by: John Ky <john.ky@iohk.io>
IntersectMBO · Nov 24, 2020 · 8db8540 · 8db8540
2 parents 132a440 + 1effc0a
commit 8db8540
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cabal.project b/cabal.project
@@ -159,8 +159,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 8b69168baa362abdeabe6a3bf50f912f62ac44b6
-  --sha256: 1gfhafyqll36qd1grkbc69x5fg1j75000nmad172r1h4r95irfdd
+  tag: 9aa3cb03deb367f5f237ab694d2c9e01b6cf431f
+  --sha256: 0nn1ywww0drvvdsr0yqlgg0dmhjgz9zpdp3rmq94zihbpl4sms99
   subdir:
     io-sim
     io-sim-classes

diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs
@@ -55,7 +55,7 @@ import qualified Cardano.Ledger.ShelleyMA.Timelocks as MA
 import qualified Cardano.Ledger.Torsor as Core
 
 -- TODO: this should be exposed via Cardano.Api
-import           Shelley.Spec.Ledger.API
+import           Shelley.Spec.Ledger.API hiding (ShelleyBasedEra)
 import           Shelley.Spec.Ledger.BlockChain (LastAppliedBlock (..))
 import           Shelley.Spec.Ledger.Coin (DeltaCoin (..))
 import           Shelley.Spec.Ledger.PParams (PParamsUpdate)