Rearrange TraceOptions to match NodeConfiguration FromJSON` instance

cardano-config/src/Cardano/Config/Types.hs

@@ -352,38 +352,27 @@ instance FromJSON ViewMode where
 --   which verbosity to the log output.
 data TraceOptions = TraceOptions
   { traceVerbosity :: !TracingVerbosity
+  , traceBlockFetchClient :: !Bool
+  , traceBlockFetchDecisions :: !Bool
+  , traceBlockFetchProtocol :: !Bool
+  , traceBlockFetchProtocolSerialised :: !Bool
+  , traceBlockFetchServer :: !Bool
   , traceChainDB :: !Bool
-    -- ^ By default we use 'readableChainDB' tracer, if on this it will use
-    -- more verbose tracer
-
-    -- Consensus Tracers --
   , traceChainSyncClient :: !Bool
-  , traceChainSyncHeaderServer :: !Bool
   , traceChainSyncBlockServer :: !Bool
-  , traceBlockFetchDecisions :: !Bool
-  , traceBlockFetchClient :: !Bool
-  , traceBlockFetchServer :: !Bool
-  , traceTxInbound :: !Bool
-  , traceTxOutbound :: !Bool
-  , traceLocalTxSubmissionServer :: !Bool
-  , traceMempool :: !Bool
-  , traceForge :: !Bool
-    -----------------------
-
-    -- Protocol Tracers --
+  , traceChainSyncHeaderServer :: !Bool
   , traceChainSyncProtocol :: !Bool
-    -- There's two variants of the block fetch tracer and for now
-    -- at least we'll set them both together from the same flags.
-  , traceBlockFetchProtocol :: !Bool
-  , traceBlockFetchProtocolSerialised :: !Bool
-  , traceTxSubmissionProtocol :: !Bool
-  , traceLocalChainSyncProtocol :: !Bool
-  , traceLocalTxSubmissionProtocol :: !Bool
-  , traceIpSubscription :: !Bool
-    -----------------------
-
-  , traceDnsSubscription :: !Bool
   , traceDnsResolver :: !Bool
+  , traceDnsSubscription :: !Bool
   , traceErrorPolicy :: !Bool
+  , traceForge :: !Bool
+  , traceIpSubscription :: !Bool
+  , traceLocalChainSyncProtocol :: !Bool
+  , traceLocalTxSubmissionProtocol :: !Bool
+  , traceLocalTxSubmissionServer :: !Bool
+  , traceMempool :: !Bool
   , traceMux :: !Bool
+  , traceTxInbound :: !Bool
+  , traceTxOutbound :: !Bool
+  , traceTxSubmissionProtocol :: !Bool
   } deriving (Eq, Show)