Merge remote-tracking branch 'upstream/master'

Author: NanuIjaz

cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs

@@ -858,21 +858,25 @@ instance
       , "mempoolSize" .= forMachine dtal mpSzAfter
       ]
   forMachine dtal (TraceMempoolRejectedTx tx txApplyErr mpSz) =
-    mconcat
+    mconcat $
       [ "kind" .= String "TraceMempoolRejectedTx"
-      , "err" .= forMachine dtal txApplyErr
       , "tx" .= forMachine dtal tx
       , "mempoolSize" .= forMachine dtal mpSz
+      ] <>
+      [ "err" .= forMachine dtal txApplyErr
+      | dtal >= DDetailed
       ]
   forMachine dtal (TraceMempoolRemoveTxs txs mpSz) =
     mconcat
       [ "kind" .= String "TraceMempoolRemoveTxs"
       , "txs"
           .= map
             ( \(tx, err) ->
-                Aeson.object
+                Aeson.object $
                   [ "tx" .= forMachine dtal (txForgetValidated tx)
-                  , "reason" .= forMachine dtal err
+                  ] <>
+                  [ "err" .= forMachine dtal err
+                  | dtal >= DDetailed
                   ]
             )
             txs

cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs

@@ -1326,21 +1326,25 @@ instance ( ToObject (ApplyTxErr blk), ToObject (GenTx blk),
       , "mempoolSize" .= toObject verb mpSzAfter
       ]
   toObject verb (TraceMempoolRejectedTx tx txApplyErr mpSz) =
-    mconcat
+    mconcat $
       [ "kind" .= String "TraceMempoolRejectedTx"
-      , "err" .= toObject verb txApplyErr
       , "tx" .= toObject verb tx
       , "mempoolSize" .= toObject verb mpSz
+      ] <>
+      [ "err" .= toObject verb txApplyErr
+      | verb == MaximalVerbosity
       ]
   toObject verb (TraceMempoolRemoveTxs txs mpSz) =
     mconcat
       [ "kind" .= String "TraceMempoolRemoveTxs"
       , "txs"
           .= map
             ( \(tx, err) ->
-                Aeson.object
+                Aeson.object $
                   [ "tx" .= toObject verb (txForgetValidated tx)
-                  , "reason" .= toObject verb err
+                  ] <>
+                  [ "err" .= toObject verb err
+                  | verb == MaximalVerbosity
                   ]
             )
             txs