Revert "fix proofs pool init"

This reverts commit 782078f.

Author: ssd04

process/block/baseProcess.go

@@ -976,14 +976,10 @@ func (bp *baseProcessor) cleanupPools(headerHandler data.HeaderHandler) {
 		highestPrevFinalBlockNonce,
 	)
 
-	if bp.enableEpochsHandler.IsFlagEnabled(common.EquivalentMessagesFlag) {
-		err := bp.dataPool.Proofs().CleanupProofsBehindNonce(bp.shardCoordinator.SelfId(), highestPrevFinalBlockNonce)
-		if err != nil {
-			log.Warn("failed to cleanup notarized proofs behind nonce",
-				"nonce", noncesToPrevFinal,
-				"shardID", bp.shardCoordinator.SelfId(),
-				"error", err)
-		}
+	err := bp.dataPool.Proofs().CleanupProofsBehindNonce(bp.shardCoordinator.SelfId(), highestPrevFinalBlockNonce)
+	if err != nil {
+		log.Warn("%w: failed to cleanup notarized proofs behind nonce %d on shardID %d",
+			err, noncesToPrevFinal, bp.shardCoordinator.SelfId())
 	}
 
 	if bp.shardCoordinator.SelfId() == core.MetachainShardId {
@@ -1015,14 +1011,10 @@ func (bp *baseProcessor) cleanupPoolsForCrossShard(
 		crossNotarizedHeader.GetNonce(),
 	)
 
-	if bp.enableEpochsHandler.IsFlagEnabled(common.EquivalentMessagesFlag) {
-		err = bp.dataPool.Proofs().CleanupProofsBehindNonce(shardID, noncesToPrevFinal)
-		if err != nil {
-			log.Warn("failed to cleanup notarized proofs behind nonce",
-				"nonce", noncesToPrevFinal,
-				"shardID", shardID,
-				"error", err)
-		}
+	err = bp.dataPool.Proofs().CleanupProofsBehindNonce(shardID, noncesToPrevFinal)
+	if err != nil {
+		log.Warn("%w: failed to cleanup notarized proofs behind nonce %d on shardID %d",
+			err, noncesToPrevFinal, shardID)
 	}
 }
 

testscommon/dataRetriever/poolFactory.go

@@ -225,8 +225,6 @@ func CreatePoolsHolderWithTxPool(txPool dataRetriever.ShardedDataCacherNotifier)
 	heartbeatPool, err := storageunit.NewCache(cacherConfig)
 	panicIfError("CreatePoolsHolderWithTxPool", err)
 
-	proofsPool := proofscache.NewProofsPool()
-
 	currentBlockTransactions := dataPool.NewCurrentBlockTransactionsPool()
 	currentEpochValidatorInfo := dataPool.NewCurrentEpochValidatorInfoPool()
 	dataPoolArgs := dataPool.DataPoolArgs{
@@ -244,7 +242,6 @@ func CreatePoolsHolderWithTxPool(txPool dataRetriever.ShardedDataCacherNotifier)
 		PeerAuthentications:       peerAuthPool,
 		Heartbeats:                heartbeatPool,
 		ValidatorsInfo:            validatorsInfo,
-		Proofs:                    proofsPool,
 	}
 	holder, err := dataPool.NewDataPool(dataPoolArgs)
 	panicIfError("CreatePoolsHolderWithTxPool", err)