Add CPrivateSendClientOptions::GetJsonInfo()

dashpay · Jul 17, 2020 · cdf7a74 · cdf7a74
1 parent 9629e59
commit cdf7a74
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/privatesend/privatesend-client.cpp b/src/privatesend/privatesend-client.cpp
@@ -1843,6 +1843,18 @@ void CPrivateSendClientManager::GetJsonInfo(UniValue& obj) const
     obj.pushKV("sessions",  arrSessions);
 }
 
+void CPrivateSendClientOptions::GetJsonInfo(UniValue& obj) const
+{
+    assert(obj.isObject());
+    obj.pushKV("enabled",           privateSendClientOptions.fEnablePrivateSend);
+    obj.pushKV("multisession",      privateSendClientOptions.fPrivateSendMultiSession);
+    obj.pushKV("max_sessions",      privateSendClientOptions.nPrivateSendSessions);
+    obj.pushKV("max_rounds",        privateSendClientOptions.nPrivateSendRounds);
+    obj.pushKV("max_amount",        privateSendClientOptions.nPrivateSendAmount);
+    obj.pushKV("denoms_goal",       privateSendClientOptions.nPrivateSendDenomsGoal);
+    obj.pushKV("denoms_hardcap",    privateSendClientOptions.nPrivateSendDenomsHardCap);
+}
+
 void DoPrivateSendMaintenance(CConnman& connman)
 {
     privateSendClientQueueManager.DoMaintenance();

diff --git a/src/privatesend/privatesend-client.h b/src/privatesend/privatesend-client.h
@@ -298,6 +298,8 @@ class CPrivateSendClientOptions
         fPrivateSendMultiSession(DEFAULT_PRIVATESEND_MULTISESSION)
     {
     }
+
+    void GetJsonInfo(UniValue& obj) const;
 };
 
 void DoPrivateSendMaintenance(CConnman& connman);

diff --git a/src/rpc/privatesend.cpp b/src/rpc/privatesend.cpp
@@ -136,14 +136,9 @@ UniValue getprivatesendinfo(const JSONRPCRequest& request)
 
 #ifdef ENABLE_WALLET
 
-    obj.pushKV("enabled",           privateSendClientOptions.fEnablePrivateSend);
-    obj.pushKV("multisession",      privateSendClientOptions.fPrivateSendMultiSession);
-    obj.pushKV("max_sessions",      privateSendClientOptions.nPrivateSendSessions);
-    obj.pushKV("max_rounds",        privateSendClientOptions.nPrivateSendRounds);
-    obj.pushKV("max_amount",        privateSendClientOptions.nPrivateSendAmount);
-    obj.pushKV("denoms_goal",       privateSendClientOptions.nPrivateSendDenomsGoal);
-    obj.pushKV("denoms_hardcap",    privateSendClientOptions.nPrivateSendDenomsHardCap);
-    obj.pushKV("queue_size",        privateSendClientQueueManager.GetQueueSize());
+    privateSendClientOptions.GetJsonInfo(obj);
+
+    obj.pushKV("queue_size", privateSendClientQueueManager.GetQueueSize());
 
     CWallet* const pwallet = GetWalletForJSONRPCRequest(request);
     if (!pwallet) {