optimize testcase

Author: 317787106

framework/src/main/java/org/tron/common/logsfilter/capsule/LogsFilterCapsule.java

@@ -34,11 +34,6 @@ public class LogsFilterCapsule extends FilterTriggerCapsule {
 
   private final TronJsonRpcImpl jsonRpc;
 
-  public LogsFilterCapsule(long blockNumber, String blockHash, Bloom bloom,
-      List<TransactionInfo> txInfoList, boolean solidified, boolean removed) {
-    this(blockNumber, blockHash, bloom, txInfoList, solidified, removed, null);
-  }
-
   public LogsFilterCapsule(long blockNumber, String blockHash, Bloom bloom,
       List<TransactionInfo> txInfoList, boolean solidified, boolean removed,
       TronJsonRpcImpl jsonRpc) {
@@ -53,8 +48,6 @@ public LogsFilterCapsule(long blockNumber, String blockHash, Bloom bloom,
 
   @Override
   public void processFilterTrigger() {
-    if (jsonRpc != null) {
-      jsonRpc.handleLogsFilter(this);
-    }
+    jsonRpc.handleLogsFilter(this);
   }
 }

framework/src/test/java/org/tron/common/logsfilter/capsule/LogsFilterCapsuleTest.java

@@ -6,16 +6,19 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.tron.common.bloom.Bloom;
+import org.tron.core.services.jsonrpc.TronJsonRpcImpl;
 
 public class LogsFilterCapsuleTest {
 
   private LogsFilterCapsule capsule;
+  private TronJsonRpcImpl jsonRpc;
 
   @Before
   public void setUp() {
+    jsonRpc = new TronJsonRpcImpl(null, null, null);
     capsule = new LogsFilterCapsule(0,
         "e58f33f9baf9305dc6f82b9f1934ea8f0ade2defb951258d50167028c780351f",
-        new Bloom(), new ArrayList<>(), true, false);
+        new Bloom(), new ArrayList<>(), true, false, jsonRpc);
   }
 
   @Test

framework/src/test/java/org/tron/core/jsonrpc/HandleLogsFilterTest.java

@@ -51,7 +51,7 @@ public void testMatchingFilter_receivesLogElements() throws JsonRpcInvalidParams
     List<TransactionInfo> txInfoList =
         Collections.singletonList(buildTxInfoWithLog(new byte[20]));
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false);
+        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false, jsonRpc);
 
     jsonRpc.handleLogsFilter(capsule);
 
@@ -69,7 +69,7 @@ public void testBlockNumberBelowRange_noResult() throws JsonRpcInvalidParamsExce
     List<TransactionInfo> txInfoList =
         Collections.singletonList(buildTxInfoWithLog(new byte[20]));
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(50L, "0xabcdef", null, txInfoList, false, false);
+        new LogsFilterCapsule(50L, "0xabcdef", null, txInfoList, false, false, jsonRpc);
 
     jsonRpc.handleLogsFilter(capsule);
 
@@ -93,7 +93,7 @@ public void testExpiredFilter_removedFromMap() throws Exception {
     List<TransactionInfo> txInfoList =
         Collections.singletonList(buildTxInfoWithLog(new byte[20]));
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false);
+        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false, jsonRpc);
 
     jsonRpc.handleLogsFilter(capsule);
 
@@ -113,7 +113,7 @@ public void testSolidifiedCapsule_routedToSolidityMap() throws JsonRpcInvalidPar
     List<TransactionInfo> txInfoList =
         Collections.singletonList(buildTxInfoWithLog(new byte[20]));
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, true, false);
+        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, true, false, jsonRpc);
 
     jsonRpc.handleLogsFilter(capsule);
 
@@ -134,7 +134,7 @@ public void testNonSolidifiedCapsule_routedToFullMap() throws JsonRpcInvalidPara
     List<TransactionInfo> txInfoList =
         Collections.singletonList(buildTxInfoWithLog(new byte[20]));
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false);
+        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false, jsonRpc);
 
     jsonRpc.handleLogsFilter(capsule);
 
@@ -154,7 +154,7 @@ public void testMultipleMatchingFilters_bothReceiveEvents() throws JsonRpcInvali
     List<TransactionInfo> txInfoList =
         Collections.singletonList(buildTxInfoWithLog(new byte[20]));
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false);
+        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false, jsonRpc);
 
     jsonRpc.handleLogsFilter(capsule);
 
@@ -170,7 +170,7 @@ public void testEmptyTxInfoList_noResult() throws JsonRpcInvalidParamsException
     jsonRpc.getEventFilter2ResultFull().put(FILTER_ID_1, filterAndResult);
 
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(150L, "0xabcdef", null, Collections.emptyList(), false, false);
+        new LogsFilterCapsule(150L, "0xabcdef", null, Collections.emptyList(), false, false, jsonRpc);
 
     jsonRpc.handleLogsFilter(capsule);
 
@@ -205,7 +205,7 @@ public void testParallelPath_allMatchingFilters_receiveEvents() throws Exception
     }
 
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false);
+        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false, jsonRpc);
     jsonRpc.handleLogsFilter(capsule);
 
     for (int i = 0; i < count; i++) {
@@ -238,7 +238,7 @@ public void testParallelPath_expiredFiltersRemoved() throws Exception {
     List<TransactionInfo> txInfoList =
         Collections.singletonList(buildTxInfoWithLog(new byte[20]));
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false);
+        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, false, false, jsonRpc);
     jsonRpc.handleLogsFilter(capsule);
 
     for (int i = 0; i < expiredCount; i++) {
@@ -272,7 +272,7 @@ public void testParallelPath_solidifiedCapsule_routedToSolidityMap() throws Exce
     fullMap.put("parallel-solid-full-0", fullFilter);
 
     LogsFilterCapsule capsule =
-        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, true, false);
+        new LogsFilterCapsule(150L, "0xabcdef", null, txInfoList, true, false, jsonRpc);
     jsonRpc.handleLogsFilter(capsule);
 
     for (int i = 0; i < count; i++) {