Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ src_libbitcoin_protocol_la_CPPFLAGS = -I${srcdir}/include ${zmq_BUILD_CPPFLAGS}
src_libbitcoin_protocol_la_LIBADD = ${zmq_LIBS} ${bitcoin_system_LIBS}
src_libbitcoin_protocol_la_SOURCES = \
src/settings.cpp \
src/config/authority.cpp \
src/config/endpoint.cpp \
src/config/sodium.cpp \
src/zmq/authenticator.cpp \
src/zmq/certificate.cpp \
Expand Down Expand Up @@ -94,9 +92,6 @@ include_bitcoin_protocol_HEADERS = \

include_bitcoin_protocol_configdir = ${includedir}/bitcoin/protocol/config
include_bitcoin_protocol_config_HEADERS = \
include/bitcoin/protocol/config/authority.hpp \
include/bitcoin/protocol/config/config.hpp \
include/bitcoin/protocol/config/endpoint.hpp \
include/bitcoin/protocol/config/sodium.hpp

include_bitcoin_protocol_zmqdir = ${includedir}/bitcoin/protocol/zmq
Expand Down
2 changes: 0 additions & 2 deletions builds/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,6 @@ link_libraries(
#------------------------------------------------------------------------------
add_library( ${CANONICAL_LIB_NAME}
"../../src/settings.cpp"
"../../src/config/authority.cpp"
"../../src/config/endpoint.cpp"
"../../src/config/sodium.cpp"
"../../src/zmq/authenticator.cpp"
"../../src/zmq/certificate.cpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,6 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\config\authority.cpp" />
<ClCompile Include="..\..\..\..\src\config\endpoint.cpp" />
<ClCompile Include="..\..\..\..\src\config\sodium.cpp" />
<ClCompile Include="..\..\..\..\src\settings.cpp" />
<ClCompile Include="..\..\..\..\src\zmq\authenticator.cpp" />
Expand All @@ -139,9 +137,6 @@
<ItemGroup>
<ClInclude Include="..\..\..\..\include\bitcoin\protocol.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\boost.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\config\authority.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\config\config.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\config\endpoint.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\config\sodium.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\define.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\network.hpp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\config\authority.cpp">
<Filter>src\config</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\config\endpoint.cpp">
<Filter>src\config</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\config\sodium.cpp">
<Filter>src\config</Filter>
</ClCompile>
Expand Down Expand Up @@ -86,15 +80,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\boost.hpp">
<Filter>include\bitcoin\protocol</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\config\authority.hpp">
<Filter>include\bitcoin\protocol\config</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\config\config.hpp">
<Filter>include\bitcoin\protocol\config</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\config\endpoint.hpp">
<Filter>include\bitcoin\protocol\config</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\protocol\config\sodium.hpp">
<Filter>include\bitcoin\protocol\config</Filter>
</ClInclude>
Expand Down
3 changes: 0 additions & 3 deletions include/bitcoin/protocol.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
#include <bitcoin/protocol/network.hpp>
#include <bitcoin/protocol/settings.hpp>
#include <bitcoin/protocol/version.hpp>
#include <bitcoin/protocol/config/authority.hpp>
#include <bitcoin/protocol/config/config.hpp>
#include <bitcoin/protocol/config/endpoint.hpp>
#include <bitcoin/protocol/config/sodium.hpp>
#include <bitcoin/protocol/zmq/authenticator.hpp>
#include <bitcoin/protocol/zmq/certificate.hpp>
Expand Down
99 changes: 0 additions & 99 deletions include/bitcoin/protocol/config/authority.hpp

This file was deleted.

26 changes: 0 additions & 26 deletions include/bitcoin/protocol/config/config.hpp

This file was deleted.

103 changes: 0 additions & 103 deletions include/bitcoin/protocol/config/endpoint.hpp

This file was deleted.

7 changes: 3 additions & 4 deletions include/bitcoin/protocol/zmq/authenticator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include <unordered_map>
#include <unordered_set>
#include <bitcoin/system.hpp>
#include <bitcoin/protocol/config/config.hpp>
#include <bitcoin/protocol/define.hpp>
#include <bitcoin/protocol/zmq/context.hpp>
#include <bitcoin/protocol/zmq/socket.hpp>
Expand All @@ -45,7 +44,7 @@ class BCP_API authenticator
typedef std::shared_ptr<authenticator> ptr;

/// The fixed inprocess authentication endpoint.
static const endpoint authentication_point;
static const system::config::endpoint authentication_point;

/// There may be only one authenticator per process.
authenticator(thread_priority priority=thread_priority::normal) NOEXCEPT;
Expand Down Expand Up @@ -77,10 +76,10 @@ class BCP_API authenticator
virtual void allow(const system::hash_digest& public_key) NOEXCEPT;

/// Allow clients with the following ip addresses (whitelist).
virtual void allow(const authority& address) NOEXCEPT;
virtual void allow(const system::config::authority& address) NOEXCEPT;

/// Allow clients with the following ip addresses (blacklist).
virtual void deny(const authority& address) NOEXCEPT;
virtual void deny(const system::config::authority& address) NOEXCEPT;

protected:
void work() NOEXCEPT override;
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/protocol/zmq/certificate.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define LIBBITCOIN_PROTOCOL_ZMQ_CERTIFICATE_HPP

#include <bitcoin/system.hpp>
#include <bitcoin/protocol/config/config.hpp>
#include <bitcoin/protocol/config/sodium.hpp>
#include <bitcoin/protocol/define.hpp>

namespace libbitcoin {
Expand Down
8 changes: 4 additions & 4 deletions include/bitcoin/protocol/zmq/socket.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define LIBBITCOIN_PROTOCOL_ZMQ_SOCKET_HPP

#include <memory>
#include <bitcoin/protocol/config/config.hpp>
#include <bitcoin/protocol/config/sodium.hpp>
#include <bitcoin/protocol/define.hpp>
#include <bitcoin/protocol/settings.hpp>
#include <bitcoin/protocol/zmq/certificate.hpp>
Expand Down Expand Up @@ -91,10 +91,10 @@ class BCP_API socket
identifier id() const NOEXCEPT;

/// Bind the socket to the specified local address.
error::code bind(const endpoint& address) NOEXCEPT;
error::code bind(const system::config::endpoint& address) NOEXCEPT;

/// Connect the socket to the specified remote address.
error::code connect(const endpoint& address) NOEXCEPT;
error::code connect(const system::config::endpoint& address) NOEXCEPT;

/// Sets the domain for ZAP (ZMQ RFC 27) authentication.
bool set_authentication_domain(const std::string& domain) NOEXCEPT;
Expand All @@ -115,7 +115,7 @@ class BCP_API socket
bool set_certificate(const certificate& certificate) NOEXCEPT;

/// Configure the socket to connect through the specified socks5 proxy.
bool set_socks_proxy(const authority& socks_proxy) NOEXCEPT;
bool set_socks_proxy(const system::config::authority& socks_proxy) NOEXCEPT;

/// Configure subscriber socket to apply the message filter.
bool set_subscription(const system::data_chunk& filter) NOEXCEPT;
Expand Down
Loading
Loading