@@ -57,7 +57,7 @@ import Control.Monad.Trans.Except
57
57
import Control.Monad.Trans.Except.Extra (firstExceptT , handleIOExceptT , hoistEither , left )
58
58
import Control.State.Transition
59
59
import Data.Aeson as Aeson
60
- import qualified Data.Aeson.Types as Data.Aeson.Types.Internal
60
+ import Data.Aeson.Types ( Parser )
61
61
import Data.Bifunctor
62
62
import Data.ByteArray (ByteArrayAccess )
63
63
import qualified Data.ByteArray
@@ -764,7 +764,7 @@ instance FromJSON NodeConfig where
764
764
parseJSON v =
765
765
Aeson. withObject " NodeConfig" parse v
766
766
where
767
- parse :: Object -> Data.Aeson.Types.Internal. Parser NodeConfig
767
+ parse :: Object -> Parser NodeConfig
768
768
parse o =
769
769
NodeConfig
770
770
<$> o .:? " PBftSignatureThreshold"
@@ -786,47 +786,47 @@ instance FromJSON NodeConfig where
786
786
<*> parseAlonzoHardForkEpoch o
787
787
<*> parseBabbageHardForkEpoch o
788
788
789
- parseByronProtocolVersion :: Object -> Data.Aeson.Types.Internal. Parser Cardano.Chain.Update. ProtocolVersion
789
+ parseByronProtocolVersion :: Object -> Parser Cardano.Chain.Update. ProtocolVersion
790
790
parseByronProtocolVersion o =
791
791
Cardano.Chain.Update. ProtocolVersion
792
792
<$> o .: " LastKnownBlockVersion-Major"
793
793
<*> o .: " LastKnownBlockVersion-Minor"
794
794
<*> o .: " LastKnownBlockVersion-Alt"
795
795
796
- parseByronSoftwareVersion :: Object -> Data.Aeson.Types.Internal. Parser Cardano.Chain.Update. SoftwareVersion
796
+ parseByronSoftwareVersion :: Object -> Parser Cardano.Chain.Update. SoftwareVersion
797
797
parseByronSoftwareVersion o =
798
798
Cardano.Chain.Update. SoftwareVersion
799
799
<$> fmap Cardano.Chain.Update. ApplicationName (o .: " ApplicationName" )
800
800
<*> o .: " ApplicationVersion"
801
801
802
- parseShelleyHardForkEpoch :: Object -> Data.Aeson.Types.Internal. Parser Consensus. TriggerHardFork
802
+ parseShelleyHardForkEpoch :: Object -> Parser Consensus. TriggerHardFork
803
803
parseShelleyHardForkEpoch o =
804
804
asum
805
805
[ Consensus. TriggerHardForkAtEpoch <$> o .: " TestShelleyHardForkAtEpoch"
806
806
, pure $ Consensus. TriggerHardForkAtVersion 2 -- Mainnet default
807
807
]
808
808
809
- parseAllegraHardForkEpoch :: Object -> Data.Aeson.Types.Internal. Parser Consensus. TriggerHardFork
809
+ parseAllegraHardForkEpoch :: Object -> Parser Consensus. TriggerHardFork
810
810
parseAllegraHardForkEpoch o =
811
811
asum
812
812
[ Consensus. TriggerHardForkAtEpoch <$> o .: " TestAllegraHardForkAtEpoch"
813
813
, pure $ Consensus. TriggerHardForkAtVersion 3 -- Mainnet default
814
814
]
815
815
816
- parseMaryHardForkEpoch :: Object -> Data.Aeson.Types.Internal. Parser Consensus. TriggerHardFork
816
+ parseMaryHardForkEpoch :: Object -> Parser Consensus. TriggerHardFork
817
817
parseMaryHardForkEpoch o =
818
818
asum
819
819
[ Consensus. TriggerHardForkAtEpoch <$> o .: " TestMaryHardForkAtEpoch"
820
820
, pure $ Consensus. TriggerHardForkAtVersion 4 -- Mainnet default
821
821
]
822
822
823
- parseAlonzoHardForkEpoch :: Object -> Data.Aeson.Types.Internal. Parser Consensus. TriggerHardFork
823
+ parseAlonzoHardForkEpoch :: Object -> Parser Consensus. TriggerHardFork
824
824
parseAlonzoHardForkEpoch o =
825
825
asum
826
826
[ Consensus. TriggerHardForkAtEpoch <$> o .: " TestAlonzoHardForkAtEpoch"
827
827
, pure $ Consensus. TriggerHardForkAtVersion 5 -- Mainnet default
828
828
]
829
- parseBabbageHardForkEpoch :: Object -> Data.Aeson.Types.Internal. Parser Consensus. TriggerHardFork
829
+ parseBabbageHardForkEpoch :: Object -> Parser Consensus. TriggerHardFork
830
830
parseBabbageHardForkEpoch o =
831
831
asum
832
832
[ Consensus. TriggerHardForkAtEpoch <$> o .: " TestBabbageHardForkAtEpoch"
0 commit comments