LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #13291: test: Don't include torcontrol.cpp into the test file

Browse source 
97c112d4ca Declare TorReply parsing functions in torcontrol_tests (Ben Woosley)

Pull request description:

  These methods are standalone string parsing methods which were included
  into test via an include of torcontrol.cpp, which is bad practice.

  ~~Splitting them out reveals that they were the only torcontrol.cpp
  methods under test, so the test file is renamed tor_reply_tests.cpp.~~

  Introduced in #10408

Tree-SHA512: 8ff11a9c900a88f910a73dfe16f43581a567e9d60e9298a8a963fc9dd7cffb4d97a644da677610aafb7d89f1dd1cede9afeae2c6344305e021a9a322dbcea0ac
This commit is contained in:
MarcoFalke 2018-05-24 09:09:33 -04:00
commit 536120ec39
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/test/torcontrol_tests.cpp
View file

@ -3,10 +3,18 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
// //
#include <test/test_bitcoin.h> #include <test/test_bitcoin.h>
#include <torcontrol.cpp> #include <torcontrol.h>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <map>
#include <string>
#include <utility>
std::pair<std::string, std::string> SplitTorReplyLine(const std::string& s);
std::map<std::string, std::string> ParseTorReplyMapping(const std::string& s);
BOOST_FIXTURE_TEST_SUITE(torcontrol_tests, BasicTestingSetup) BOOST_FIXTURE_TEST_SUITE(torcontrol_tests, BasicTestingSetup)

5
src/torcontrol.cpp
View file

@ -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 * Grammar is implicitly defined in https://spec.torproject.org/control-spec by
* the server reply formats for PROTOCOLINFO (S3.21) and AUTHCHALLENGE (S3.24). * the server reply formats for PROTOCOLINFO (S3.21) and AUTHCHALLENGE (S3.24).
*/ */
static std::pair<std::string,std::string> SplitTorReplyLine(const std::string &s) std::pair<std::string,std::string> SplitTorReplyLine(const std::string &s)
{ {
size_t ptr=0; size_t ptr=0;
std::string type; std::string type;
@ -270,7 +270,7 @@ static std::pair<std::string,std::string> SplitTorReplyLine(const std::string &s
* the server reply formats for PROTOCOLINFO (S3.21), AUTHCHALLENGE (S3.24), * the server reply formats for PROTOCOLINFO (S3.21), AUTHCHALLENGE (S3.24),
* and ADD_ONION (S3.27). See also sections 2.1 and 2.3. * and ADD_ONION (S3.27). See also sections 2.1 and 2.3.
*/ */
static std::map<std::string,std::string> ParseTorReplyMapping(const std::string &s) std::map<std::string,std::string> ParseTorReplyMapping(const std::string &s)
{ {
std::map<std::string,std::string> mapping; std::map<std::string,std::string> mapping;
size_t ptr=0; size_t ptr=0;
@ -773,4 +773,3 @@ void StopTorControl()
gBase = nullptr; gBase = nullptr;
} }
} }