fixes after review

Author: sstanculeanu

process/block/metablockProposal.go

@@ -1206,7 +1206,7 @@ func (mp *metaProcessor) checkHeadersSequenceCorrectness(hdrsForShard []ShardHea
 		}
 
 		if mp.blockTracker.IsHeaderQuarantined(shardHdrInfo.Hash) {
-			return fmt.Errorf("%w with hash %s", errIncludedQuarantinedHeader, shardHdrInfo.Hash)
+			return fmt.Errorf("%w with hash %x", errIncludedQuarantinedHeader, shardHdrInfo.Hash)
 		}
 
 		err = mp.headerValidator.IsHeaderConstructionValid(shardHdrInfo.Header, lastNotarizedHeaderInfoForShard.Header)

process/block/shardblockProposal.go

@@ -824,7 +824,7 @@ func (sp *shardProcessor) checkMetaHeadersValidityAndFinalityProposal(header dat
 
 	for idx, metaHeader := range usedMetaHeaders {
 		if sp.blockTracker.IsHeaderQuarantined(usedMetaHashes[idx]) {
-			return fmt.Errorf("%w with hash %s", errIncludedQuarantinedHeader, usedMetaHashes[idx])
+			return fmt.Errorf("%w with hash %x", errIncludedQuarantinedHeader, usedMetaHashes[idx])
 		}
 
 		err = sp.headerValidator.IsHeaderConstructionValid(metaHeader, lastCrossNotarizedHeader)

process/track/baseBlockTrack.go

@@ -28,6 +28,8 @@ var log = logger.GetOrCreate("process/track")
 
 const maxNonceDifference = 3 // TODO move this to a config file
 
+const maxQuarantineRoundDelta = 3
+
 // HeaderInfo holds the information about a header
 type HeaderInfo struct {
 	Hash   []byte
@@ -206,12 +208,12 @@ func (bbt *baseBlockTrack) sweepQuarantinedHeaders(ctx context.Context) {
 			currentRound := bbt.roundHandler.Index()
 			for _, key := range bbt.quarantinedHeaders.Keys() {
 				val, _ := bbt.quarantinedHeaders.Get(key)
-				headerRound, ok := val.(int64)
+				headerRound, ok := val.(uint64)
 				if !ok {
 					continue
 				}
 
-				if currentRound-headerRound < maxNonceDifference {
+				if currentRound-int64(headerRound) < maxQuarantineRoundDelta {
 					continue
 				}
 
@@ -938,7 +940,9 @@ func (bbt *baseBlockTrack) restoreTrackedHeadersToGenesis() {
 
 // Close closes the internal loop
 func (bbt *baseBlockTrack) Close() error {
-	bbt.cancelFunc()
+	if bbt.cancelFunc != nil {
+		bbt.cancelFunc()
+	}
 
 	return nil
 }