From ed79508bf5254bd794d7f1cb7daf68c9f0aae635 Mon Sep 17 00:00:00 2001 From: halibobo1205 Date: Tue, 28 Jul 2026 15:21:49 +0800 Subject: [PATCH 1/2] refactor: remove unused main methods --- .../core/capsule/PedersenHashCapsule.java | 21 -------- .../common/utils/client/utils/AbiUtil.java | 33 ------------ .../tron/core/consensus/server/TronTest.java | 51 ------------------- 3 files changed, 105 deletions(-) delete mode 100755 framework/src/test/java/org/tron/core/consensus/server/TronTest.java diff --git a/chainbase/src/main/java/org/tron/core/capsule/PedersenHashCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/PedersenHashCapsule.java index 137675bb822..6e56fbcd4aa 100644 --- a/chainbase/src/main/java/org/tron/core/capsule/PedersenHashCapsule.java +++ b/chainbase/src/main/java/org/tron/core/capsule/PedersenHashCapsule.java @@ -3,7 +3,6 @@ import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import lombok.extern.slf4j.Slf4j; -import org.tron.common.utils.ByteArray; import org.tron.common.zksnark.JLibrustzcash; import org.tron.common.zksnark.LibrustzcashParam.MerkleHashParams; import org.tron.core.exception.ZksnarkException; @@ -55,26 +54,6 @@ public static PedersenHashCapsule uncommitted() throws ZksnarkException { return compressCapsule; } - public static void main(String[] args) { - try { - byte[] a = - ByteArray - .fromHexString("05655316a07e6ec8c9769af54ef98b30667bfb6302b32987d552227dae86a087"); - byte[] b = - ByteArray - .fromHexString("06041357de59ba64959d1b60f93de24dfe5ea1e26ed9e8a73d35b225a1845ba7"); - - PedersenHash sa = PedersenHash.newBuilder().setContent(ByteString.copyFrom(a)).build(); - PedersenHash sb = PedersenHash.newBuilder().setContent(ByteString.copyFrom(b)).build(); - - PedersenHash result = combine(sa, sb, 25).getInstance(); - // 61a50a5540b4944da27cbd9b3d6ec39234ba229d2c461f4d719bc136573bf45b - System.out.println(ByteArray.toHexString(result.getContent().toByteArray())); - } catch (ZksnarkException e) { - e.printStackTrace(); - } - } - public ByteString getContent() { return this.pedersenHash.getContent(); } diff --git a/framework/src/test/java/org/tron/common/utils/client/utils/AbiUtil.java b/framework/src/test/java/org/tron/common/utils/client/utils/AbiUtil.java index 5f28fb3e13a..eac590d621f 100644 --- a/framework/src/test/java/org/tron/common/utils/client/utils/AbiUtil.java +++ b/framework/src/test/java/org/tron/common/utils/client/utils/AbiUtil.java @@ -251,39 +251,6 @@ public static String generateOccupationConstantPrivateKey() { return privateKey.toString(); } - public static void main(String[] args) { - String method = "test(string,int2,string)"; - String params = "asdf,3123,adf"; - - String arrayMethod1 = "test(uint,uint256[3])"; - String arrayMethod2 = "test(uint,uint256[])"; - String arrayMethod3 = "test(uint,address[])"; - String byteMethod1 = "test(bytes32,bytes11)"; - String tokenMethod = "test(trcToken,uint256)"; - String tokenParams = "\"nmb\",111"; - - System.out.println("token:" + parseMethod(tokenMethod, tokenParams)); - - String method1 = "test(uint256,string,string,uint256[])"; - String expected1 = "db103cf30000000000000000000000000000000000000000000000000000000000000005000" - + "0000000000000000000000000000000000000000000000000000000000080000000000000000000000000000" - + "00000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000" - + "0000000000100000000000000000000000000000000000000000000000000000000000000000142000000000" - + "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - + "0000000000000000000000000000143000000000000000000000000000000000000000000000000000000000" - + "0000000000000000000000000000000000000000000000000000000000000000000030000000000000000000" - + "0000000000000000000000000000000000000000000010000000000000000000000000000000000000000000" - + "0000000000000000000020000000000000000000000000000000000000000000000000000000000000003"; - String method2 = "test(uint256,string,string,uint256[3])"; - String listString = "1 ,\"B\",\"C\", [1, 2, 3]"; - System.out.println(parseMethod(method1, listString)); - System.out.println(parseMethod(method2, listString)); - - String bytesValue1 = "\"0112313\",112313"; - - System.out.println(parseMethod(byteMethod1, bytesValue1)); - } - abstract static class Coder { boolean dynamic = false; diff --git a/framework/src/test/java/org/tron/core/consensus/server/TronTest.java b/framework/src/test/java/org/tron/core/consensus/server/TronTest.java deleted file mode 100755 index 5746a3cb59c..00000000000 --- a/framework/src/test/java/org/tron/core/consensus/server/TronTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * java-tron is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * java-tron is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.tron.core.consensus.server; - -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.Enumeration; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class TronTest { - - /** - * main of trontest. - */ - public static void main(String[] args) { - try { - Enumeration allNetInterfaces = NetworkInterface.getNetworkInterfaces(); - InetAddress ip = null; - while (allNetInterfaces.hasMoreElements()) { - NetworkInterface netInterface = (NetworkInterface) allNetInterfaces.nextElement(); - System.out.println(netInterface.getName()); - Enumeration addresses = netInterface.getInetAddresses(); - while (addresses.hasMoreElements()) { - ip = (InetAddress) addresses.nextElement(); - if (ip != null && ip instanceof Inet4Address) { - System.out.println("IP = " + ip.getHostAddress()); - } - } - } - } catch (Exception e) { - logger.debug(e.getMessage(), e); - } - - - } -} From 167bc3856747e7079d28e0285a0a61c30a16e95a Mon Sep 17 00:00:00 2001 From: halibobo1205 Date: Tue, 28 Jul 2026 15:48:32 +0800 Subject: [PATCH 2/2] fix: replace direct stack trace output with logging --- .../src/main/java/org/tron/core/actuator/ActuatorFactory.java | 2 +- .../main/java/org/tron/core/capsule/TransactionCapsule.java | 4 ++-- common/src/main/java/org/tron/common/utils/FileUtil.java | 2 +- .../services/interfaceJsonRpcOnPBFT/JsonRpcOnPBFTServlet.java | 4 ++-- .../interfaceJsonRpcOnSolidity/JsonRpcOnSolidityServlet.java | 4 ++-- .../java/org/tron/core/services/jsonrpc/JsonRpcApiUtil.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/actuator/src/main/java/org/tron/core/actuator/ActuatorFactory.java b/actuator/src/main/java/org/tron/core/actuator/ActuatorFactory.java index 34031150ad1..2a890facc2c 100644 --- a/actuator/src/main/java/org/tron/core/actuator/ActuatorFactory.java +++ b/actuator/src/main/java/org/tron/core/actuator/ActuatorFactory.java @@ -40,7 +40,7 @@ public static List createActuator(TransactionCapsule transactionCapsul actuatorList .add(getActuatorByContract(contract, chainBaseManager, transactionCapsule)); } catch (IllegalAccessException | InstantiationException e) { - e.printStackTrace(); + logger.error("Failed to create actuator for contract {}.", contract.getType(), e); } }); return actuatorList; diff --git a/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java index b3f560541cf..ede63533d2c 100755 --- a/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java +++ b/chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java @@ -796,7 +796,7 @@ public String toString() { toStringBuff.append("transfer amount=").append(transferContract.getAmount()) .append("\n"); } catch (InvalidProtocolBufferException e) { - e.printStackTrace(); + logger.debug("Failed to unpack transfer contract.", e); } } else if (contract.getType().equals(ContractType.TransferAssetContract)) { TransferAssetContract transferAssetContract; @@ -808,7 +808,7 @@ public String toString() { toStringBuff.append("transfer amount=").append(transferAssetContract.getAmount()) .append("\n"); } catch (InvalidProtocolBufferException e) { - e.printStackTrace(); + logger.debug("Failed to unpack transfer asset contract.", e); } } if (this.transaction.getSignatureList().size() >= i.get() + 1) { diff --git a/common/src/main/java/org/tron/common/utils/FileUtil.java b/common/src/main/java/org/tron/common/utils/FileUtil.java index 8031c764019..2de08cc1da7 100644 --- a/common/src/main/java/org/tron/common/utils/FileUtil.java +++ b/common/src/main/java/org/tron/common/utils/FileUtil.java @@ -102,7 +102,7 @@ public static int readData(String filePath, char[] buf) { try (BufferedReader bufRead = new BufferedReader(new FileReader(file))) { len = bufRead.read(buf, 0, buf.length); } catch (IOException ex) { - ex.printStackTrace(); + logger.warn("Failed to read data from file.", ex); return 0; } return len; diff --git a/framework/src/main/java/org/tron/core/services/interfaceJsonRpcOnPBFT/JsonRpcOnPBFTServlet.java b/framework/src/main/java/org/tron/core/services/interfaceJsonRpcOnPBFT/JsonRpcOnPBFTServlet.java index bcc383e55db..e672e78741f 100644 --- a/framework/src/main/java/org/tron/core/services/interfaceJsonRpcOnPBFT/JsonRpcOnPBFTServlet.java +++ b/framework/src/main/java/org/tron/core/services/interfaceJsonRpcOnPBFT/JsonRpcOnPBFTServlet.java @@ -21,9 +21,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) try { super.doPost(request, response); } catch (IOException e) { - e.printStackTrace(); + logger.error("Failed to process JSON-RPC request.", e); throw new RuntimeException(e); } }); } -} \ No newline at end of file +} diff --git a/framework/src/main/java/org/tron/core/services/interfaceJsonRpcOnSolidity/JsonRpcOnSolidityServlet.java b/framework/src/main/java/org/tron/core/services/interfaceJsonRpcOnSolidity/JsonRpcOnSolidityServlet.java index a20c7906ad0..66deed0dc72 100644 --- a/framework/src/main/java/org/tron/core/services/interfaceJsonRpcOnSolidity/JsonRpcOnSolidityServlet.java +++ b/framework/src/main/java/org/tron/core/services/interfaceJsonRpcOnSolidity/JsonRpcOnSolidityServlet.java @@ -21,9 +21,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) try { super.doPost(request, response); } catch (IOException e) { - e.printStackTrace(); + logger.error("Failed to process JSON-RPC request.", e); throw new RuntimeException(e); } }); } -} \ No newline at end of file +} diff --git a/framework/src/main/java/org/tron/core/services/jsonrpc/JsonRpcApiUtil.java b/framework/src/main/java/org/tron/core/services/jsonrpc/JsonRpcApiUtil.java index f4bba9fbf37..623c9b8e091 100644 --- a/framework/src/main/java/org/tron/core/services/jsonrpc/JsonRpcApiUtil.java +++ b/framework/src/main/java/org/tron/core/services/jsonrpc/JsonRpcApiUtil.java @@ -209,7 +209,7 @@ public static List getTo(Transaction transaction) { } return list; } catch (Exception ex) { - ex.printStackTrace(); + logger.warn("Failed to extract transaction addresses.", ex); } return list; } @@ -361,7 +361,7 @@ public static long getAmountFromTransactionInfo(String hash, ContractType contra logger.warn("Exception happens when get amount from transactionInfo. Exception = [{}]", Throwables.getStackTraceAsString(e)); } catch (Throwable t) { - t.printStackTrace(); + logger.warn("Unexpected error when getting amount from transaction info.", t); } return amount; }