SR change unit test

Author: warku123

framework/src/main/java/org/tron/core/metrics/blockchain/BlockChainMetricManager.java

@@ -46,7 +46,8 @@ public class BlockChainMetricManager {
   @Setter
   private String failProcessBlockReason = "";
   private final Set<String> lastActiveWitnesses = ConcurrentHashMap.newKeySet();
-  private long lastNextMaintenanceTime = 0;
+  // To control SR set change metric update logic, -1 means not initialized
+  private long lastNextMaintenanceTime = -1; 
 
   public BlockChainInfo getBlockChainInfo() {
     BlockChainInfo blockChainInfo = new BlockChainInfo();
@@ -181,7 +182,7 @@ public void applyBlock(BlockCapsule block) {
 
     // SR set change detection
     long nextMaintenanceTime = dbManager.getDynamicPropertiesStore().getNextMaintenanceTime();
-    if (lastNextMaintenanceTime == 0) {
+    if (lastNextMaintenanceTime == -1) {
       lastNextMaintenanceTime = nextMaintenanceTime;
       lastActiveWitnesses.addAll(chainBaseManager.getWitnessScheduleStore().getActiveWitnesses()
           .stream().map(w -> Hex.toHexString(w.toByteArray())).collect(Collectors.toSet()));
@@ -196,13 +197,6 @@ public void applyBlock(BlockCapsule block) {
   }
 
   private void recordSrSetChange(Set<String> currentWitnesses) {
-    if (currentWitnesses.isEmpty()) {
-      return;
-    }
-    if (lastActiveWitnesses.isEmpty()) {
-      lastActiveWitnesses.addAll(currentWitnesses);
-      return;
-    }
     Set<String> added = new HashSet<>(currentWitnesses);
     added.removeAll(lastActiveWitnesses);
 

framework/src/test/java/org/tron/core/metrics/prometheus/PrometheusApiServiceTest.java

@@ -7,6 +7,7 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -66,7 +67,7 @@ protected static void initParameter(CommonParameter parameter) {
     parameter.setMetricsPrometheusEnable(true);
   }
 
-  protected void check(byte[] address) throws Exception {
+  protected void check(byte[] address, Map<ByteString, String> witnessAndAccount) throws Exception {
     Double memoryBytes = CollectorRegistry.defaultRegistry.getSampleValue(
         "system_total_physical_memory_bytes");
     Assert.assertNotNull(memoryBytes);
@@ -87,10 +88,42 @@ protected void check(byte[] address) throws Exception {
         "tron:block_empty_total", new String[] {"miner"}, new String[] {minerBase58});
 
     Assert.assertNotNull(emptyBlock);
-    // The initial address is in the active witness list along with 2 randomly generated witnesses,
-    // so it produces blocks every 3 slots. Total empty blocks = 1 (first manual block) + blocks/3
-    // (from the loop) + 1 if blocks%3 != 0 (partial round)
-    Assert.assertEquals(emptyBlock.intValue(), 1 + blocks / 3 + (blocks % 3 != 0 ? 1 : 0));
+    Assert.assertEquals(emptyBlock.intValue(), 1);
+
+    // Check SR_REMOVE for initial address (removed when addTestWitnessAndAccount() is called)
+    Double srRemoveCount = CollectorRegistry.defaultRegistry.getSampleValue(
+        "tron:sr_set_change_total",
+        new String[] {"action", "witness"},
+        new String[] {MetricLabels.Counter.SR_REMOVE, minerBase58}
+    );
+    Assert.assertNotNull(srRemoveCount);
+    Assert.assertEquals(1, srRemoveCount.intValue());
+
+    // Check SR_ADD and empty blocks for each new witness in witnessAndAccount (excluding initial address)
+    ByteString addressByteString = ByteString.copyFrom(address);
+    double totalNewWitnessEmptyBlocks = 0;
+    for (ByteString witnessAddress : witnessAndAccount.keySet()) {
+      if (witnessAddress.equals(addressByteString)) {
+        continue; // Skip initial address
+      }
+      String witnessBase58 = StringUtil.encode58Check(witnessAddress.toByteArray());
+      
+      // Check SR_ADD
+      Double srAddCount = CollectorRegistry.defaultRegistry.getSampleValue(
+          "tron:sr_set_change_total",
+          new String[] {"action", "witness"},
+          new String[] {MetricLabels.Counter.SR_ADD, witnessBase58}
+      );
+      Assert.assertNotNull("SR_ADD should be recorded for witness: " + witnessBase58, srAddCount);
+      Assert.assertEquals("Each new witness should have 1 SR_ADD record", 1, srAddCount.intValue());
+      
+      // Collect empty blocks count
+      Double witnessEmptyBlock = CollectorRegistry.defaultRegistry.getSampleValue(
+          "tron:block_empty_total", new String[] {"miner"}, new String[] {witnessBase58});
+      Assert.assertNotNull(witnessEmptyBlock);
+      totalNewWitnessEmptyBlocks += witnessEmptyBlock;
+    }
+    Assert.assertEquals(blocks, (int)totalNewWitnessEmptyBlocks);
 
     Double errorLogs = CollectorRegistry.defaultRegistry.getSampleValue(
         "tron:error_info_total", new String[] {"net"}, new String[] {MetricLabels.UNDEFINED});
@@ -142,10 +175,20 @@ public void testMetric() throws Exception {
 
     Map<ByteString, String> witnessAndAccount = addTestWitnessAndAccount();
     witnessAndAccount.put(ByteString.copyFrom(address), key);
+    
+    // Explicitly update WitnessScheduleStore to remove initial address, triggering SR_REMOVE metric
+    List<ByteString> newActiveWitnesses = new ArrayList<>(witnessAndAccount.keySet());
+    newActiveWitnesses.remove(ByteString.copyFrom(address));
+    chainBaseManager.getWitnessScheduleStore().saveActiveWitnesses(newActiveWitnesses);
+    
+    // Update nextMaintenanceTime to trigger SR set change detection
+    long nextMaintenanceTime = chainBaseManager.getDynamicPropertiesStore().getNextMaintenanceTime();
+    chainBaseManager.getDynamicPropertiesStore().updateNextMaintenanceTime(nextMaintenanceTime + 3600_000L);
+    
     for (int i = 0; i < blocks; i++) {
       generateBlock(witnessAndAccount);
     }
-    check(address);
+    check(address, witnessAndAccount);
   }
 
   private Map<ByteString, String> addTestWitnessAndAccount() {