cosmetic changes + empty chan

multiversx · Feb 11, 2025 · fe0aace · fe0aace
1 parent 32d381c
commit fe0aace
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/process/block/baseProcess.go b/process/block/baseProcess.go
@@ -2401,14 +2401,16 @@ func (bp *baseProcessor) checkReceivedHeaderAndUpdateMissingAttesting(headerHand
 		return
 	}
 
-	bp.mutRequestedAttestingNoncesMap.Lock()
-	defer bp.mutRequestedAttestingNoncesMap.Unlock()
-
+	bp.mutRequestedAttestingNoncesMap.RLock()
 	isWaitingForProofs := len(bp.requestedAttestingNoncesMap) > 0
+	defer bp.mutRequestedAttestingNoncesMap.RUnlock()
 	if !isWaitingForProofs {
 		return
 	}
 
+	bp.mutRequestedAttestingNoncesMap.Lock()
+	defer bp.mutRequestedAttestingNoncesMap.Unlock()
+
 	receivedShard := headerHandler.GetShardID()
 	prevHash := headerHandler.GetPrevHash()
 	_, isHeaderWithoutProof := bp.requestedAttestingNoncesMap[string(prevHash)]

diff --git a/process/block/metablock.go b/process/block/metablock.go
@@ -425,6 +425,7 @@ func (mp *metaProcessor) checkProofsForShardData(header *block.MetaBlock) error
 
 	mp.mutRequestedAttestingNoncesMap.Lock()
 	mp.requestedAttestingNoncesMap = make(map[string]uint64)
+	_ = core.EmptyChannel(mp.allProofsReceived)
 	mp.mutRequestedAttestingNoncesMap.Unlock()
 
 	for _, shardData := range header.ShardInfo {

diff --git a/process/block/shardblock.go b/process/block/shardblock.go
@@ -295,6 +295,7 @@ func (sp *shardProcessor) ProcessBlock(
 
 	sp.mutRequestedAttestingNoncesMap.Lock()
 	sp.requestedAttestingNoncesMap = make(map[string]uint64)
+	_ = core.EmptyChannel(sp.allProofsReceived)
 	sp.mutRequestedAttestingNoncesMap.Unlock()
 
 	// check proofs for cross notarized metablocks