Move sleep-time from node argument to rpc argument #1826
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bushstar
previously approved these changes
Mar 17, 2023
shohamc1
reviewed
Mar 17, 2023
| @@ -596,7 +596,8 @@ UniValue votegovbatch(const JSONRPCRequest &request) { | |||
| {"masternodeId", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "The masternode ID, operator or owner address"}, | |||
| {"decision", RPCArg::Type::STR, RPCArg::Optional::OMITTED, "The vote decision (yes/no/neutral)"}, | |||
| }}, | |||
| }, | |||
| {"sleepTime", RPCArg::Type::NUM, RPCArg::Optional::OMITTED, "Sets sleeping time for voteGovBatch, by default the value is set to 500ms"} | |||
There was a problem hiding this comment.
Thought the same at a glance but look okay in the file imo.
ain/src/masternodes/rpc_proposals.cpp
Line 599 in 9fcb98c
shohamc1
reviewed
Mar 17, 2023
src/masternodes/rpc_proposals.cpp
Outdated
| @@ -611,7 +612,7 @@ UniValue votegovbatch(const JSONRPCRequest &request) { | |||
| RPCTypeCheck(request.params, {UniValue::VARR}, false); | |||
|
|
|||
| const auto &keys = request.params[0].get_array(); | |||
| auto sleepTime = gArgs.GetBoolArg("-sleep-time", SLEEP_TIME_MILLIS); | |||
| auto sleepTime = request.params[1].isNull() ? SLEEP_TIME_MILLIS : request.params[1].get_int(); | |||
There was a problem hiding this comment.
I think you need to check if the param is set first, otherwise the node may crash.
Bushstar
reviewed
Mar 17, 2023
| @@ -612,7 +613,7 @@ UniValue votegovbatch(const JSONRPCRequest &request) { | |||
| RPCTypeCheck(request.params, {UniValue::VARR}, false); | |||
|
|
|||
| const auto &keys = request.params[0].get_array(); | |||
| auto sleepTime = request.params[1].isNull() ? SLEEP_TIME_MILLIS : request.params[1].get_int(); | |||
| auto sleepTime = (request.params.size() > 1 && request.params[1].isNull()) ? SLEEP_TIME_MILLIS : request.params[1].get_int(); | |||
There was a problem hiding this comment.
You can leave this as it but isNull() is safe to call without a size() check as UniValue defines [] usage and makes it safe to use on non-existent entries. Check other isNull() usage in the code on optional RPC arguments.
Bushstar
approved these changes
Mar 17, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously added a sleep_time node parameter for votegovbatch. Moved it as an RPC parameter instead of node parameter.