Skip to content

Commit 406274d

Browse files
Merge pull request #6239 from waynercheung/feat/opt_err_msg
feat(jsonrpc): keep old err_msg when block range is invalid
2 parents 70aa382 + 8841b5e commit 406274d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogFilterWrapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.tron.core.services.jsonrpc.filters;
22

33
import static org.tron.common.math.Maths.min;
4-
import static org.tron.core.services.jsonrpc.TronJsonRpcImpl.INVALID_BLOCK_RANGE;
54

65
import com.google.protobuf.ByteString;
76
import lombok.Getter;
@@ -84,7 +83,7 @@ public LogFilterWrapper(FilterRequest fr, long currentMaxBlockNum, Wallet wallet
8483
toBlockSrc = Long.MAX_VALUE;
8584
}
8685
if (fromBlockSrc > toBlockSrc) {
87-
throw new JsonRpcInvalidParamsException(INVALID_BLOCK_RANGE);
86+
throw new JsonRpcInvalidParamsException("please verify: fromBlock <= toBlock");
8887
}
8988
}
9089
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ public void testLogFilterWrapper() {
605605
LogFilterWrapper logFilterWrapper =
606606
new LogFilterWrapper(new FilterRequest("0x78", "0x14", null, null, null), 100, null);
607607
} catch (JsonRpcInvalidParamsException e) {
608-
Assert.assertEquals("invalid block range params", e.getMessage());
608+
Assert.assertEquals("please verify: fromBlock <= toBlock", e.getMessage());
609609
}
610610

611611
//fromBlock or toBlock is not hex num

0 commit comments

Comments
 (0)