mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-05-23 10:23:27 +02:00
net: remove Sock default constructor, it's not necessary
This commit is contained in:
parent
7829272f78
commit
5086a99b84
@ -56,9 +56,10 @@ CAddress ConsumeAddress(FuzzedDataProvider& fuzzed_data_provider) noexcept
|
||||
}
|
||||
|
||||
FuzzedSock::FuzzedSock(FuzzedDataProvider& fuzzed_data_provider)
|
||||
: m_fuzzed_data_provider{fuzzed_data_provider}, m_selectable{fuzzed_data_provider.ConsumeBool()}
|
||||
: Sock{fuzzed_data_provider.ConsumeIntegralInRange<SOCKET>(INVALID_SOCKET - 1, INVALID_SOCKET)},
|
||||
m_fuzzed_data_provider{fuzzed_data_provider},
|
||||
m_selectable{fuzzed_data_provider.ConsumeBool()}
|
||||
{
|
||||
m_socket = fuzzed_data_provider.ConsumeIntegralInRange<SOCKET>(INVALID_SOCKET - 1, INVALID_SOCKET);
|
||||
}
|
||||
|
||||
FuzzedSock::~FuzzedSock()
|
||||
|
@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(move_assignment)
|
||||
{
|
||||
const SOCKET s = CreateSocket();
|
||||
Sock* sock1 = new Sock(s);
|
||||
Sock* sock2 = new Sock();
|
||||
Sock* sock2 = new Sock(INVALID_SOCKET);
|
||||
*sock2 = std::move(*sock1);
|
||||
delete sock1;
|
||||
BOOST_CHECK(!SocketIsClosed(s));
|
||||
@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE(send_and_receive)
|
||||
SendAndRecvMessage(*sock0, *sock1);
|
||||
|
||||
Sock* sock0moved = new Sock(std::move(*sock0));
|
||||
Sock* sock1moved = new Sock();
|
||||
Sock* sock1moved = new Sock(INVALID_SOCKET);
|
||||
*sock1moved = std::move(*sock1);
|
||||
|
||||
delete sock0;
|
||||
|
@ -106,10 +106,10 @@ constexpr auto ALL_NETWORKS = std::array{
|
||||
class StaticContentsSock : public Sock
|
||||
{
|
||||
public:
|
||||
explicit StaticContentsSock(const std::string& contents) : m_contents{contents}
|
||||
explicit StaticContentsSock(const std::string& contents)
|
||||
: Sock{INVALID_SOCKET},
|
||||
m_contents{contents}
|
||||
{
|
||||
// Just a dummy number that is not INVALID_SOCKET.
|
||||
m_socket = INVALID_SOCKET - 1;
|
||||
}
|
||||
|
||||
~StaticContentsSock() override { m_socket = INVALID_SOCKET; }
|
||||
@ -192,6 +192,11 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
bool IsConnected(std::string&) const override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
const std::string m_contents;
|
||||
mutable size_t m_consumed{0};
|
||||
|
@ -24,8 +24,6 @@ static inline bool IOErrorIsPermanent(int err)
|
||||
return err != WSAEAGAIN && err != WSAEINTR && err != WSAEWOULDBLOCK && err != WSAEINPROGRESS;
|
||||
}
|
||||
|
||||
Sock::Sock() : m_socket(INVALID_SOCKET) {}
|
||||
|
||||
Sock::Sock(SOCKET s) : m_socket(s) {}
|
||||
|
||||
Sock::Sock(Sock&& other)
|
||||
|
@ -26,10 +26,7 @@ static constexpr auto MAX_WAIT_FOR_IO = 1s;
|
||||
class Sock
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* Default constructor, creates an empty object that does nothing when destroyed.
|
||||
*/
|
||||
Sock();
|
||||
Sock() = delete;
|
||||
|
||||
/**
|
||||
* Take ownership of an existent socket.
|
||||
|
Loading…
x
Reference in New Issue
Block a user