Parsing of non-p2p topology file

Make the non-p2p parsing API of the topology the same way as p2p one.

Author: coot

cardano-node/src/Cardano/Node/Configuration/Topology.hs

@@ -10,6 +10,7 @@ module Cardano.Node.Configuration.Topology
   , RemoteAddress(..)
   , nodeAddressToSockAddr
   , readTopologyFile
+  , readTopologyFileOrError
   , remoteAddressToNodeAddress
   )
 where
@@ -147,3 +148,10 @@ readTopologyFile nc = do
                     \If you specified the correct topology file \
                     \make sure that you correctly setup EnableP2P \
                     \configuration flag. " <> Text.pack err
+
+readTopologyFileOrError :: NodeConfiguration -> IO NetworkTopology
+readTopologyFileOrError nc =
+      readTopologyFile nc
+  >>= either (\err -> panic $ "Cardano.Node.Configuration.Topology.readTopologyFile: "
+                           <> err)
+             pure

cardano-node/src/Cardano/Node/Configuration/TopologyP2P.hs

@@ -217,6 +217,6 @@ readTopologyFile nc = do
 readTopologyFileOrError :: NodeConfiguration -> IO NetworkTopology
 readTopologyFileOrError nc =
       readTopologyFile nc
-  >>= either (\err -> panic $ "Cardano.Node.Run.handleSimpleNodeP2P.readTopologyFile: "
+  >>= either (\err -> panic $ "Cardano.Node.Configuration.TopologyP2P.readTopologyFile: "
                            <> err)
              pure

cardano-node/src/Cardano/Node/Run.hs

@@ -451,8 +451,7 @@ handleSimpleNode runP p2pMode tracers nc onKernel = do
               )
               Nothing
 #endif
-        eitherTopology <- TopologyNonP2P.readTopologyFile nc
-        nt <- either (\err -> panic $ "Cardano.Node.Run.handleSimpleNodeNonP2P.readTopologyFile: " <> err) pure eitherTopology
+        nt <- TopologyNonP2P.readTopologyFileOrError nc
         let (ipProducerAddrs, dnsProducerAddrs) = producerAddressesNonP2P nt
 
             dnsProducers :: [DnsSubscriptionTarget]