aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2021-05-14 12:52:15 +0200
committerMarcoFalke <falke.marco@gmail.com>2021-05-14 12:49:16 +0200
commitfa2e614d16af84327adf1c02746d0f73e0f48111 (patch)
tree9b376181d98a70c87164de57c3bf6abc3ed6d0b2
parent61fea5217118e19e0eefde4d32a11e18c841826c (diff)
downloadbitcoin-fa2e614d16af84327adf1c02746d0f73e0f48111.tar.xz
test: Fix off-by-one in mockscheduler test RPC
-rw-r--r--src/rpc/misc.cpp2
-rw-r--r--src/scheduler.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index 0e0da8f22b..ab239fe79c 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -424,7 +424,7 @@ static RPCHelpMan mockscheduler()
// check params are valid values
RPCTypeCheck(request.params, {UniValue::VNUM});
int64_t delta_seconds = request.params[0].get_int64();
- if ((delta_seconds <= 0) || (delta_seconds > 3600)) {
+ if (delta_seconds <= 0 || delta_seconds > 3600) {
throw std::runtime_error("delta_time must be between 1 and 3600 seconds (1 hr)");
}
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index b3ee23f139..02ada969a4 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -5,6 +5,7 @@
#include <scheduler.h>
#include <random.h>
+#include <util/time.h>
#include <assert.h>
#include <functional>
@@ -80,7 +81,7 @@ void CScheduler::schedule(CScheduler::Function f, std::chrono::system_clock::tim
void CScheduler::MockForward(std::chrono::seconds delta_seconds)
{
- assert(delta_seconds.count() > 0 && delta_seconds < std::chrono::hours{1});
+ assert(delta_seconds > 0s && delta_seconds <= 1h);
{
LOCK(newTaskMutex);