From 97c112d4ca42caf0668af2b8e71a46de72b23def Mon Sep 17 00:00:00 2001 From: Ben Woosley Date: Mon, 21 May 2018 10:53:18 -0700 Subject: [PATCH] Declare TorReply parsing functions in torcontrol_tests Rather than including the implementation file into the test, which is bad practice. --- src/test/torcontrol_tests.cpp | 10 +++++++++- src/torcontrol.cpp | 5 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/test/torcontrol_tests.cpp b/src/test/torcontrol_tests.cpp index 8bd5ce122..c7ceb2f1e 100644 --- a/src/test/torcontrol_tests.cpp +++ b/src/test/torcontrol_tests.cpp @@ -3,10 +3,18 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. // #include -#include +#include #include +#include +#include +#include + + +std::pair SplitTorReplyLine(const std::string& s); +std::map ParseTorReplyMapping(const std::string& s); + BOOST_FIXTURE_TEST_SUITE(torcontrol_tests, BasicTestingSetup) diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index 717d1cf7e..1791bfd7f 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -251,7 +251,7 @@ bool TorControlConnection::Command(const std::string &cmd, const ReplyHandlerCB& * Grammar is implicitly defined in https://spec.torproject.org/control-spec by * the server reply formats for PROTOCOLINFO (S3.21) and AUTHCHALLENGE (S3.24). */ -static std::pair SplitTorReplyLine(const std::string &s) +std::pair SplitTorReplyLine(const std::string &s) { size_t ptr=0; std::string type; @@ -270,7 +270,7 @@ static std::pair SplitTorReplyLine(const std::string &s * the server reply formats for PROTOCOLINFO (S3.21), AUTHCHALLENGE (S3.24), * and ADD_ONION (S3.27). See also sections 2.1 and 2.3. */ -static std::map ParseTorReplyMapping(const std::string &s) +std::map ParseTorReplyMapping(const std::string &s) { std::map mapping; size_t ptr=0; @@ -773,4 +773,3 @@ void StopTorControl() gBase = nullptr; } } -