Skip to content

feat(jsonrpc): keep old err_msg when block range is invalid #6239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2025
+2 −3
Merged

feat(jsonrpc): keep old err_msg when block range is invalid #6239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogFilterWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion framework/src/test/java/org/tron/core/jsonrpc/JsonrpcServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down