Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PLT-7979 Provide support for sending ledger events over a TChan #1

Merged
merged 10 commits into from
Dec 22, 2023
2 changes: 1 addition & 1 deletion .github/workflows/check-hlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: 'Set up HLint'
uses: rwe/actions-hlint-setup@v1
with:
version: 3.3
version: 3.5

- name: 'Run HLint'
uses: rwe/actions-hlint-run@v2
4 changes: 2 additions & 2 deletions .github/workflows/check-mainnet-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ jobs:
for f in "${test_files[@]}"; do
nix_file="result/$f"
repo_file="configuration/cardano/$f"
if ! jq -e --argfile nix "$nix_file" --argfile repo "$repo_file" -n '$repo | reduce keys[] as $k (true; . and $repo[$k] == $nix[$k])' &>/dev/null ; then
if ! jq -e --argfile nix "$nix_file" --argfile repo "$repo_file" -n '$repo | reduce keys[] as $k (true; . and $repo[$k] == $nix[$k])' >/dev/null ; then
echo "Nix file $nix_file does not have all the same top-level entries as the file from repository $repo_file"
diff "$nix_file" "$repo_file"
diff <(jq -S . "$nix_file") <(jq -S . "$repo_file")
exit 1
fi
done
Expand Down
4 changes: 2 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ package bitvec
source-repository-package
type: git
location: https://github.com/CardanoSolutions/ouroboros-consensus
tag: 019a99b71f9d009e1a2101d09f6be0e75a33ea96
--sha256: 1y39a5zp8g8bra5nss5n8wwjla3x8hc8xwnn3r8wwvkxsrgplgw4
tag: 79da9a368cb6d2e7ed5ff5e89bb318b94c3c606d
--sha256: 02wjbvgbfdr5rybncxgx6slxh4gzx1vh4i34n6h834qghiq4yykb
subdir:
ouroboros-consensus
ouroboros-consensus-cardano
Expand Down
4 changes: 2 additions & 2 deletions cardano-git-rev/src/Cardano/Git/Rev.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE ForeignFunctionInterface #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE ForeignFunctionInterface #-}

module Cardano.Git.Rev
( gitRev
Expand All @@ -13,8 +13,8 @@ import qualified Data.Text as T
#if !defined(arm_HOST_ARCH)
import Cardano.Git.RevFromGit (gitRevFromGit)
#endif
import GHC.Foreign (peekCStringLen)
import Foreign.C.String (CString)
import GHC.Foreign (peekCStringLen)
import System.IO (utf8)
import System.IO.Unsafe (unsafeDupablePerformIO)

Expand Down
2 changes: 1 addition & 1 deletion cardano-node-capi/src/Node.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ foreign export ccall "runNode" crunNode :: Int -> Ptr CString -> IO ()
crunNode :: Int -> Ptr CString -> IO ()
crunNode argc argv = peekArray argc argv >>= mapM peekCString >>= \args ->
case execParserPure pref opts args of
Success pnc -> runNode pnc
Success pnc -> runNode pnc []
Failure f -> print f
CompletionInvoked _ -> putStrLn "Completion Invoked?"
where
Expand Down
2 changes: 1 addition & 1 deletion cardano-node/app/cardano-node.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ main = do
cmd <- Opt.customExecParser p opts

case cmd of
RunCmd args -> runNode args
RunCmd args -> runNode args []
TraceDocumentation tdc -> runTraceDocumentationCmd tdc
VersionCmd -> runVersionCommand

Expand Down
2 changes: 1 addition & 1 deletion cardano-node/src/Cardano/Node/Configuration/POM.hs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import System.FilePath (takeDirectory, (</>))

import Cardano.Crypto (RequiresNetworkMagic (..))
import Cardano.Logging.Types
import Cardano.Node.Configuration.NodeAddress (SocketPath, PortNumber)
import Cardano.Node.Configuration.NodeAddress (PortNumber, SocketPath)
import Cardano.Node.Configuration.Socket (SocketConfig (..))
import Cardano.Node.Handlers.Shutdown
import Cardano.Node.Protocol.Types (Protocol (..))
Expand Down
Loading
Loading