Skip to content

Commit

Permalink
cardano-testnet | fix missing configuration option and chain extensio…
Browse files Browse the repository at this point in the history
…n check
  • Loading branch information
carbolymer committed Jan 9, 2025
1 parent 1374a61 commit 43560b6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions cardano-testnet/src/Testnet/Defaults.hs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ import qualified Data.Text as Text
import Data.Time (UTCTime)
import qualified Data.Vector as Vector
import Data.Word (Word64)
import GHC.Exts (IsList (..))
import Lens.Micro
import Numeric.Natural
import System.FilePath ((</>))
Expand Down Expand Up @@ -161,6 +162,7 @@ defaultYamlHardforkViaConfig :: ShelleyBasedEra era -> Aeson.KeyMap Aeson.Value
defaultYamlHardforkViaConfig sbe =
defaultYamlConfig
<> tracers
<> fromList [("TraceOptions", Aeson.Object mempty)]
<> protocolVersions sbe
<> hardforkViaConfig sbe
where
Expand Down
2 changes: 1 addition & 1 deletion cardano-testnet/src/Testnet/Property/Assert.hs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ assertChainExtended deadline nodeLoggingFormat nodeStdoutFile = withFrozenCallSt
case nodeLoggingFormat of
NodeLoggingFormatAsText -> IO.fileContains "Chain extended, new tip" nodeStdoutFile
NodeLoggingFormatAsJson -> fileJsonGrep nodeStdoutFile $ \v ->
Aeson.parseMaybe (Aeson.parseJSON @(LogEntry Kind)) v == Just (LogEntry (Kind "TraceAddBlockEvent.AddedToCurrentChain"))
Aeson.parseMaybe (Aeson.parseJSON @(LogEntry Kind)) v == Just (LogEntry (Kind "AddedToCurrentChain"))

newtype LogEntry a = LogEntry
{ unLogEntry :: a
Expand Down

0 comments on commit 43560b6

Please sign in to comment.