Merge #2746: Fix mnconnect missing parameter and rename cxxtimer.hpp

e2d3a4a Trivial: rename cxxtimer.hpp to cxxtimer.h (random-zebra) 21dedda RPC: fix mnconnect when first param is missing (random-zebra) Pull request description: Tackling last nits left in #2722 (review) ACKs for top commit: furszy: utACK e2d3a4a Fuzzbawls: ACK e2d3a4a Tree-SHA512: cdda59b60914516b98436ce79649556d318b450690fd476c1cb9435842c3c2b510641465ac94bcdbdd398ac307ffed79ccf27cacfb6d53547bec673ca8994375
PIVX-Project · Feb 17, 2022 · e3d5484 · e3d5484
2 parents 74cc314 + e2d3a4a
commit e3d5484
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -163,7 +163,7 @@ BITCOIN_CORE_H = \
   clientversion.h \
   coincontrol.h \
   coins.h \
-  cxxtimer.hpp \
+  cxxtimer.h \
   compat.h \
   compat/byteswap.h \
   compat/cpuid.h \

diff --git a/src/cxxtimer.hpp → src/cxxtimer.h b/src/cxxtimer.hpp → src/cxxtimer.h
diff --git a/src/llmq/quorums_dkgsession.cpp b/src/llmq/quorums_dkgsession.cpp
@@ -8,7 +8,7 @@
 #include "activemasternode.h"
 #include "bls/key_io.h"
 #include "chainparams.h"
-#include "cxxtimer.hpp"
+#include "cxxtimer.h"
 #include "init.h"
 #include "llmq/quorums_connections.h"
 #include "llmq/quorums_commitment.h"

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -772,7 +772,7 @@ const char* CLEAR_CONN = "clear_conn";
 **/
 UniValue mnconnect(const JSONRPCRequest& request)
 {
-    if (request.fHelp || request.params.size() > 4) {
+    if (request.fHelp || request.params.empty() || request.params.size() > 4) {
         throw std::runtime_error(
                 "mnconnect \"op_type\" (\"[pro_tx_hash, pro_tx_hash,..]\" llmq_type \"quorum_hash\")\n"
                 "\nAdd manual quorum members connections for internal testing purposes of the tier two p2p network layer\n"