Fix chairman

IntersectMBO · Sep 15, 2020 · 0f1be92 · 0f1be92
1 parent 45beb7c
commit 0f1be92
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/cardano-node-chairman/app/cardano-node-chairman.hs b/cardano-node-chairman/app/cardano-node-chairman.hs
@@ -3,9 +3,12 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
+import qualified Data.Text as Text
+
 import           Cardano.Chairman (chairmanTest)
 import           Cardano.Chairman.Options
-import           Cardano.Node.Types
+import           Cardano.Node.Configuration.POM (defaultPartialNodeConfiguration,
+                     makeNodeConfiguration, ncProtocol, parseNodeConfigurationFP)
 import           Cardano.Prelude hiding (option)
 import           Control.Tracer (stdoutTracer)
 import           Options.Applicative
@@ -22,9 +25,12 @@ main = do
     , caNetworkMagic
     } <- execParser opts
 
-  nc <- liftIO $ parseNodeConfigurationFP caConfigYaml
+  pnc <- liftIO . parseNodeConfigurationFP $ Just caConfigYaml
 
-  let someNodeClientProtocol = mkNodeClientProtocol $ ncProtocol nc
+  someNodeClientProtocol <-
+    case makeNodeConfiguration $ pnc <> defaultPartialNodeConfiguration of
+      Left err -> panic . Text.pack $ "Error making the NodeConfiguration for the chairman: " <> err
+      Right nc' -> return . mkNodeClientProtocol $ ncProtocol nc'
 
   chairmanTest
     stdoutTracer

diff --git a/cardano-node/chairman/chairman.hs b/cardano-node/chairman/chairman.hs
@@ -42,8 +42,7 @@ main = do
 
     partialNc <- liftIO . parseNodeConfigurationFP $ Just caConfigYaml
 
-    nc <- case makeNodeConfiguration partialNc of --TODO: Create a makeChairmanConfiguration function as
-                                                  -- we don;t need much config vs a full node
+    nc <- case makeNodeConfiguration partialNc of
             Left err -> panic $ Text.pack err
             Right nc' -> return nc'