diff --git a/src/ripple/rpc/handlers/Connect.cpp b/src/ripple/rpc/handlers/Connect.cpp index 5e60fc517..47bfd026b 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 7590466ee..3d79d53fb 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 bca0c9ced..628da745c 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 b79d1d993..c063a42c7 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;