From 8841b5e2cf1f3aa949b8e6d8a439696a6162baac Mon Sep 17 00:00:00 2001 From: waynercheung Date: Fri, 14 Mar 2025 11:49:40 +0800 Subject: [PATCH] feat(jsonrpc): keep old version err_msg when block range is invalid(from > to) for eth_getLogs and eth_newFilter --- .../tron/core/services/jsonrpc/filters/LogFilterWrapper.java | 3 +-- .../test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogFilterWrapper.java b/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogFilterWrapper.java index e1d448b00d7..7fcbab33ee3 100644 --- a/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogFilterWrapper.java +++ b/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogFilterWrapper.java @@ -1,7 +1,6 @@ package org.tron.core.services.jsonrpc.filters; import static org.tron.common.math.Maths.min; -import static org.tron.core.services.jsonrpc.TronJsonRpcImpl.INVALID_BLOCK_RANGE; import com.google.protobuf.ByteString; import lombok.Getter; @@ -84,7 +83,7 @@ public LogFilterWrapper(FilterRequest fr, long currentMaxBlockNum, Wallet wallet toBlockSrc = Long.MAX_VALUE; } if (fromBlockSrc > toBlockSrc) { - throw new JsonRpcInvalidParamsException(INVALID_BLOCK_RANGE); + throw new JsonRpcInvalidParamsException("please verify: fromBlock <= toBlock"); } } } diff --git a/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java b/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java index 6a0ab4a3745..7af59f28ace 100644 --- a/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java +++ b/framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java @@ -605,7 +605,7 @@ public void testLogFilterWrapper() { LogFilterWrapper logFilterWrapper = new LogFilterWrapper(new FilterRequest("0x78", "0x14", null, null, null), 100, null); } catch (JsonRpcInvalidParamsException e) { - Assert.assertEquals("invalid block range params", e.getMessage()); + Assert.assertEquals("please verify: fromBlock <= toBlock", e.getMessage()); } //fromBlock or toBlock is not hex num