Skip to content

Commit 64440bb

Browse files
committed
Merge bitcoin/bitcoin#28118: test: Add SyncWithValidationInterfaceQueue to mockscheduler RPC
fabef12 refactor: Use EnsureAnyNodeContext (MarcoFalke) fa16406 test: Add SyncWithValidationInterfaceQueue to mockscheduler RPC (MarcoFalke) Pull request description: There should be no risk or downside in adding a call to `SyncWithValidationInterfaceQueue` here. In fact, it will make tests less brittle. For example, * If one sets the timeouts in `test/functional/feature_fee_estimation.py` to `0`, on `master` the test will fail and here it will pass. * It may avoid a rare (theoretic) intermittent issue in https://github.com/bitcoin/bitcoin/pull/28108/files#r1268966663 ACKs for top commit: TheCharlatan: ACK fabef12 furszy: Code review ACK fabef12. Convinced by checking all current tests usages. Tree-SHA512: c9e9a536a8721d1b3f267a66b40578b34948892301affdcad121ef8e02bf17037305d0dd53aa94b1b064753e66f9cfb31823b916b707a9d812627f502b818003
2 parents 4c57e53 + fabef12 commit 64440bb

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

src/rpc/node.cpp

+6-9
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,9 @@ static RPCHelpMan setmocktime()
5757
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime cannot be negative: %s.", time));
5858
}
5959
SetMockTime(time);
60-
auto node_context = util::AnyPtr<NodeContext>(request.context);
61-
if (node_context) {
62-
for (const auto& chain_client : node_context->chain_clients) {
63-
chain_client->setMockTime(time);
64-
}
60+
const NodeContext& node_context{EnsureAnyNodeContext(request.context)};
61+
for (const auto& chain_client : node_context.chain_clients) {
62+
chain_client->setMockTime(time);
6563
}
6664

6765
return UniValue::VNULL;
@@ -89,10 +87,9 @@ static RPCHelpMan mockscheduler()
8987
throw std::runtime_error("delta_time must be between 1 and 3600 seconds (1 hr)");
9088
}
9189

92-
auto node_context = CHECK_NONFATAL(util::AnyPtr<NodeContext>(request.context));
93-
// protect against null pointer dereference
94-
CHECK_NONFATAL(node_context->scheduler);
95-
node_context->scheduler->MockForward(std::chrono::seconds(delta_seconds));
90+
const NodeContext& node_context{EnsureAnyNodeContext(request.context)};
91+
CHECK_NONFATAL(node_context.scheduler)->MockForward(std::chrono::seconds{delta_seconds});
92+
SyncWithValidationInterfaceQueue();
9693

9794
return UniValue::VNULL;
9895
},

0 commit comments

Comments
 (0)