Merge pull request #6265 from zeusoo001/opt-log

feat(log): optimize log information

Author: CodeNinjaEvan

Diff for: framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java

@@ -65,7 +65,7 @@ public TransactionLogTriggerCapsule(TransactionCapsule trxCapsule, BlockCapsule
 
   public TransactionLogTriggerCapsule(TransactionCapsule trxCapsule, BlockCapsule blockCapsule,
       int txIndex, long preCumulativeEnergyUsed, long preCumulativeLogCount,
-      TransactionInfo transactionInfo, long energyUnitPrice, boolean flag) {
+      TransactionInfo transactionInfo, long energyUnitPrice, boolean isNewEventService) {
     transactionLogTrigger = new TransactionLogTrigger();
 
     String blockHash = "";
@@ -309,7 +309,7 @@ public TransactionLogTriggerCapsule(TransactionCapsule trxCapsule, BlockCapsule
           getInternalTransactionList(programResult.getInternalTransactions()));
     }
 
-    if (Objects.isNull(trxTrace) && Objects.nonNull(transactionInfo) && flag) {
+    if (Objects.isNull(trxTrace) && Objects.nonNull(transactionInfo) && isNewEventService) {
       Protocol.ResourceReceipt receipt = transactionInfo.getReceipt();
       energyUsageTotal = receipt.getEnergyUsageTotal();
       transactionLogTrigger.setEnergyFee(receipt.getEnergyFee());

Diff for: framework/src/main/java/org/tron/core/Wallet.java

@@ -3484,7 +3484,7 @@ private void checkShieldedTRC20NoteValue(
           throw new ContractValidateException("The value in SpendNoteTRC20 must >= 0");
         }
         if (StringUtils.isEmpty(spendNote.getNote().getPaymentAddress())) {
-          throw new ContractValidateException("Payment Address in SpendNote should not be empty");
+          throw new ContractValidateException("PaymentAddress in SpendNote should not be empty");
         }
       }
     }
@@ -3495,7 +3495,7 @@ private void checkShieldedTRC20NoteValue(
           throw new ContractValidateException("The value in ReceiveNote must >= 0");
         }
         if (StringUtils.isEmpty(receiveNote.getNote().getPaymentAddress())) {
-          throw new ContractValidateException("Payment Address in ReceiveNote should not be empty");
+          throw new ContractValidateException("PaymentAddress in ReceiveNote should not be empty");
         }
       }
     }

Diff for: framework/src/main/java/org/tron/core/services/event/BlockEventLoad.java

@@ -72,25 +72,25 @@ public synchronized void load() throws Exception {
       if (tmpNum > cacheHeadNum + MAX_LOAD_NUM) {
         tmpNum = cacheHeadNum + MAX_LOAD_NUM;
       }
-      List<BlockEvent> l1 = new ArrayList<>();
-      List<BlockEvent> l2 = new ArrayList<>();
+      List<BlockEvent> blockEvents = new ArrayList<>();
+      List<BlockEvent> rollbackBlockEvents = new ArrayList<>();
       BlockEvent tmp = BlockEventCache.getHead();
 
       BlockEvent blockEvent = blockEventGet.getBlockEvent(tmpNum);
-      l1.add(blockEvent);
+      blockEvents.add(blockEvent);
       while (!blockEvent.getParentId().equals(tmp.getBlockId())) {
         tmpNum--;
         if (tmpNum == tmp.getBlockId().getNum()) {
-          l2.add(tmp);
+          rollbackBlockEvents.add(tmp);
           tmp = BlockEventCache.getBlockEvent(tmp.getParentId());
         }
         blockEvent = blockEventGet.getBlockEvent(tmpNum);
-        l1.add(blockEvent);
+        blockEvents.add(blockEvent);
       }
 
-      l2.forEach(e -> realtimeEventService.add(new Event(e, true)));
+      rollbackBlockEvents.forEach(e -> realtimeEventService.add(new Event(e, true)));
 
-      List<BlockEvent> l = Lists.reverse(l1);
+      List<BlockEvent> l = Lists.reverse(blockEvents);
       for (BlockEvent e: l) {
         BlockEventCache.add(e);
         realtimeEventService.add(new Event(e, false));

Diff for: framework/src/test/java/org/tron/core/ShieldWalletTest.java

@@ -376,7 +376,7 @@ public void testCreateShieldedContractParameters2() throws ContractExeException
       Assert.fail();
     } catch (Exception e) {
       Assert.assertTrue(e instanceof ContractValidateException);
-      Assert.assertEquals("Payment Address in ReceiveNote should not be empty",
+      Assert.assertEquals("PaymentAddress in ReceiveNote should not be empty",
           e.getMessage());
     }
 
@@ -409,7 +409,7 @@ public void testCreateShieldedContractParameters2() throws ContractExeException
       Assert.fail();
     } catch (Exception e) {
       Assert.assertTrue(e instanceof ContractValidateException);
-      Assert.assertEquals("Payment Address in SpendNote should not be empty",
+      Assert.assertEquals("PaymentAddress in SpendNote should not be empty",
           e.getMessage());
     }
   }