Use system config classes vs. one copies.

Author: evoskuil

Makefile.am

@@ -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 \
@@ -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

builds/cmake/CMakeLists.txt

@@ -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"

builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj

@@ -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" />
@@ -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" />

builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj.filters

@@ -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>
@@ -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>

include/bitcoin/protocol.hpp

@@ -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>

include/bitcoin/protocol/config/authority.hpp

@@ -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>
@@ -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;
@@ -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;

include/bitcoin/protocol/config/config.hpp

@@ -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 {