From 5f908ba870446f19f9f78ad84008a146f93dca41 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Thu, 18 Apr 2019 11:47:45 -0700
Subject: [PATCH] Make some locks more granular:

- Overlay
- Cluster
- Validator List
- Consensus

The overlay also has its own lock and manages its own thread safety.
---
 src/ripple/rpc/handlers/Connect.cpp       | 1 -
 src/ripple/rpc/handlers/ConsensusInfo.cpp | 5 +----
 src/ripple/rpc/handlers/Peers.cpp         | 2 --
 src/ripple/rpc/handlers/UnlList.cpp       | 3 +--
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/ripple/rpc/handlers/Connect.cpp b/src/ripple/rpc/handlers/Connect.cpp
index 5e60fc5172..47bfd026be 100644
--- a/src/ripple/rpc/handlers/Connect.cpp
+++ b/src/ripple/rpc/handlers/Connect.cpp
@@ -36,7 +36,6 @@ namespace ripple {
 // XXX Might allow domain for manual connections.
 Json::Value doConnect (RPC::Context& context)
 {
-    auto lock = make_lock(context.app.getMasterMutex());
     if (context.app.config().standalone())
         return "cannot connect in standalone mode";
 
diff --git a/src/ripple/rpc/handlers/ConsensusInfo.cpp b/src/ripple/rpc/handlers/ConsensusInfo.cpp
index 7590466ee2..3d79d53fbd 100644
--- a/src/ripple/rpc/handlers/ConsensusInfo.cpp
+++ b/src/ripple/rpc/handlers/ConsensusInfo.cpp
@@ -30,10 +30,7 @@ Json::Value doConsensusInfo (RPC::Context& context)
 {
     Json::Value ret (Json::objectValue);
 
-    {
-        auto lock = make_lock(context.app.getMasterMutex());
-        ret[jss::info] = context.netOps.getConsensusInfo ();
-    }
+    ret[jss::info] = context.netOps.getConsensusInfo ();
 
     return ret;
 }
diff --git a/src/ripple/rpc/handlers/Peers.cpp b/src/ripple/rpc/handlers/Peers.cpp
index bca0c9ced3..628da745ca 100644
--- a/src/ripple/rpc/handlers/Peers.cpp
+++ b/src/ripple/rpc/handlers/Peers.cpp
@@ -33,8 +33,6 @@ Json::Value doPeers (RPC::Context& context)
     Json::Value jvResult (Json::objectValue);
 
     {
-        auto lock = make_lock(context.app.getMasterMutex());
-
         jvResult[jss::peers] = context.app.overlay ().json ();
 
         auto const now = context.app.timeKeeper().now();
diff --git a/src/ripple/rpc/handlers/UnlList.cpp b/src/ripple/rpc/handlers/UnlList.cpp
index b79d1d993f..c063a42c77 100644
--- a/src/ripple/rpc/handlers/UnlList.cpp
+++ b/src/ripple/rpc/handlers/UnlList.cpp
@@ -27,7 +27,6 @@ namespace ripple {
 
 Json::Value doUnlList (RPC::Context& context)
 {
-    auto lock = make_lock(context.app.getMasterMutex());
     Json::Value obj (Json::objectValue);
 
     context.app.validators().for_each_listed (
@@ -41,7 +40,7 @@ Json::Value doUnlList (RPC::Context& context)
                 TokenType::NodePublic, publicKey);
             node[jss::trusted] = trusted;
 
-            unl.append (node);
+            unl.append (std::move (node));
         });
 
     return obj;