remove prune trie for metablock v2 flow

Author: ssd04

process/block/metablock.go

@@ -1633,10 +1633,10 @@ func (mp *metaProcessor) updateState(metaBlock data.MetaHeaderHandler, metaBlock
 			prevMetaBlock.GetValidatorStatsRootHash(),
 			mp.accountsDB[state.PeerAccountsState],
 		)
-	} else {
-		mp.pruneTrieHeaderV3(metaBlock)
 	}
 
+	// for header v3, trie prunning is triggered in async mode from headers executor
+
 	outportFinalizedHeaderHash := metaBlockHash
 	if !common.IsFlagEnabledAfterEpochsStartBlock(metaBlock, mp.enableEpochsHandler, common.AndromedaFlag) {
 		outportFinalizedHeaderHash = metaBlock.GetPrevHash()

process/block/metablock_test.go

@@ -4061,6 +4061,41 @@ func TestMetaProcessor_CrossChecksBlockHeightsMetrics(t *testing.T) {
 	requireInstance.Equal(uint64(39), savedMetrics["erd_cross_check_block_height_2"])
 }
 
+func TestMetaProcessor_PruneTrieAsyncHeader(t *testing.T) {
+	t.Parallel()
+
+	t.Run("prune trie for headerV3, prev header is headerV2", func(t *testing.T) {
+		t.Parallel()
+
+		rootHash1 := []byte("state root hash 1")
+		validatorStatsRootHash1 := []byte("validator stats root hash 1")
+
+		prevHeader := &block.MetaBlock{
+			RootHash:               rootHash1,
+			ValidatorStatsRootHash: validatorStatsRootHash1,
+		}
+		pruneTrieForHeaderV3Test(t, prevHeader, rootHash1, validatorStatsRootHash1)
+	})
+
+	t.Run("prune trie for headerV3, prev header is headerV3", func(t *testing.T) {
+		t.Parallel()
+
+		rootHash1 := []byte("state root hash 1")
+		validatorStatsRootHash1 := []byte("validator stats root hash 1")
+		prevHeader := &block.MetaBlockV3{
+			LastExecutionResult: &block.MetaExecutionResultInfo{
+				ExecutionResult: &block.BaseMetaExecutionResult{
+					BaseExecutionResult: &block.BaseExecutionResult{
+						RootHash: rootHash1,
+					},
+					ValidatorStatsRootHash: validatorStatsRootHash1,
+				},
+			},
+		}
+		pruneTrieForHeaderV3Test(t, prevHeader, rootHash1, validatorStatsRootHash1)
+	})
+}
+
 func TestMetaProcessor_UpdateState(t *testing.T) {
 	t.Parallel()
 
@@ -4127,36 +4162,6 @@ func TestMetaProcessor_UpdateState(t *testing.T) {
 		assert.True(t, cancelPruneCalledForUserAccounts)
 		assert.True(t, cancelPruneCalledForPeerAccounts)
 	})
-	t.Run("prune trie for headerV3, prev header is headerV2", func(t *testing.T) {
-		t.Parallel()
-
-		rootHash1 := []byte("state root hash 1")
-		validatorStatsRootHash1 := []byte("validator stats root hash 1")
-
-		prevHeader := &block.MetaBlock{
-			RootHash:               rootHash1,
-			ValidatorStatsRootHash: validatorStatsRootHash1,
-		}
-		pruneTrieForHeaderV3Test(t, prevHeader, rootHash1, validatorStatsRootHash1)
-
-	})
-	t.Run("prune trie for headerV3, prev header is headerV3", func(t *testing.T) {
-		t.Parallel()
-
-		rootHash1 := []byte("state root hash 1")
-		validatorStatsRootHash1 := []byte("validator stats root hash 1")
-		prevHeader := &block.MetaBlockV3{
-			LastExecutionResult: &block.MetaExecutionResultInfo{
-				ExecutionResult: &block.BaseMetaExecutionResult{
-					BaseExecutionResult: &block.BaseExecutionResult{
-						RootHash: rootHash1,
-					},
-					ValidatorStatsRootHash: validatorStatsRootHash1,
-				},
-			},
-		}
-		pruneTrieForHeaderV3Test(t, prevHeader, rootHash1, validatorStatsRootHash1)
-	})
 }
 
 func pruneTrieForHeaderV3Test(t *testing.T, prevHeader data.HeaderHandler, rootHash1 []byte, validatorStatsRootHash1 []byte) {
@@ -4238,7 +4243,6 @@ func pruneTrieForHeaderV3Test(t *testing.T, prevHeader data.HeaderHandler, rootH
 
 	mp, _ := processBlock.NewMetaProcessor(arguments)
 
-	metaBlockHash := []byte("meta block hash")
 	metaBlock := &block.MetaBlockV3{
 		PrevHash: []byte("hash"),
 		ExecutionResults: []*block.MetaExecutionResult{
@@ -4269,7 +4273,7 @@ func pruneTrieForHeaderV3Test(t *testing.T, prevHeader data.HeaderHandler, rootH
 		},
 	}
 
-	mp.UpdateState(metaBlock, metaBlockHash)
+	mp.PruneTrieAsyncHeader(metaBlock)
 
 	assert.Equal(t, 2, pruneCalledForUserAccounts)
 	assert.Equal(t, 2, pruneCalledForPeerAccounts)