[CSL-1822] Print header of received block less often

Before this commit online and up-to-date node was printing header of a
newly created block received from the network 5 times. It's quite a lot,
especially considering that each header takes about 9 lines.

Few observations:
1. Printing header in 'handleUnsolicitedHeader' makes more sense than
in 'addHeaderToBlockRequestQueue', because it's called earlier
and allows us to inspect header before we do something with it.
2. Printing header after we processed it is not useful, because we must
have printed it already. Printing hash is enough.
3. 'handleContinues' and 'handleAlternative' are called after we receive an
unsolicited header. It implies that we have printed it already, so we can
print its hash.

Author: gromakovsky

block/src/Pos/Block/Network/Announce.hs

@@ -43,7 +43,8 @@ announceBlock
     :: BlockWorkMode ctx m
     => EnqueueMsg m -> MainBlockHeader -> m (Map NodeId (m ()))
 announceBlock enqueue header = do
-    logDebug $ sformat ("Announcing header to others:\n"%build) header
+    logDebug $ sformat ("Announcing header to others: "%shortHashF)
+               (headerHash header)
     enqueue (MsgAnnounceBlockHeader OriginSender) (\addr _ -> announceBlockDo addr)
   where
     announceBlockDo

block/src/Pos/Block/Network/Logic.hs

@@ -184,9 +184,8 @@ handleUnsolicitedHeader
     -> m ()
 handleUnsolicitedHeader header nodeId = do
     logDebug $ sformat
-        ("handleUnsolicitedHeader: single header "%shortHashF%
-         " was propagated, processing")
-        hHash
+        ("handleUnsolicitedHeader: single header was propagated, processing:\n"
+         %build) header
     classificationRes <- classifyNewHeader header
     -- TODO: should we set 'To' hash to hash of header or leave it unlimited?
     case classificationRes of
@@ -399,7 +398,8 @@ addHeaderToBlockRequestQueue
     -> Bool -- ^ Was classified as chain continuation
     -> m ()
 addHeaderToBlockRequestQueue nodeId header continues = do
-    logDebug $ sformat ("addToBlockRequestQueue, : "%build) header
+    let hHash = headerHash header
+    logDebug $ sformat ("addToBlockRequestQueue, : "%shortHashF) hHash
     queue <- view (lensOf @BlockRetrievalQueueTag)
     lastKnownH <- view (lensOf @LastKnownHeaderTag)
     added <- atomically $ do
@@ -409,7 +409,7 @@ addHeaderToBlockRequestQueue nodeId header continues = do
     if added
     then logDebug $ sformat ("Added headers to block request queue: nodeId="%build%
                              ", header="%build)
-                            nodeId (headerHash header)
+                            nodeId hHash
     else logWarning $ sformat ("Failed to add headers from "%build%
                                " to block retrieval queue: queue is full")
                               nodeId
@@ -581,7 +581,8 @@ relayBlock enqueue (Right mainBlk) = do
     recoveryInProgress >>= \case
         True -> logDebug "Not relaying block in recovery mode"
         False -> do
-            logDebug $ sformat ("Calling announceBlock for "%build%".") (mainBlk ^. gbHeader)
+            logDebug $ sformat ("Calling announceBlock for "%shortHashF%".")
+                       (mainBlk ^. gbHeader . headerHashG)
             void $ announceBlock enqueue $ mainBlk ^. gbHeader
 
 ----------------------------------------------------------------------------

block/src/Pos/Block/Network/Retrieval.hs

@@ -126,10 +126,11 @@ retrievalWorkerImpl keepAliveTimer SendActions {..} =
 
     -- When we have continuation, we just try to get and apply it.
     handleContinues nodeId header = do
-        logDebug $ "handleContinues: " <> pretty header
+        let hHash = headerHash header
+        logDebug $ "handleContinues: " <> pretty hHash
         classifyNewHeader header >>= \case
             CHContinues ->
-                void $ getProcessBlocks enqueueMsg nodeId header (headerHash header)
+                void $ getProcessBlocks enqueueMsg nodeId header hHash
             res -> logDebug $
                 "processContHeader: expected header to " <>
                 "be continuation, but it's " <> show res
@@ -138,7 +139,7 @@ retrievalWorkerImpl keepAliveTimer SendActions {..} =
     -- really recovery mode (server side should send us headers as a
     -- proof) and then enter recovery mode.
     handleAlternative nodeId header = do
-        logDebug $ "handleAlternative: " <> pretty header
+        logDebug $ "handleAlternative: " <> pretty (headerHash header)
         classifyNewHeader header >>= \case
             CHInvalid _ ->
                 logError "handleAlternative: invalid header got into retrievalWorker queue"