Merge pull request #80 from evoskuil/master

Add endpoint parser tests.

Author: evoskuil

.travis.yml

@@ -75,7 +75,7 @@ script:
     # Download and build libbitcoin-server and all dependencies.
     - if [[ $OSX   && $CLANG && $STATIC  ]]; then ./install.sh --without-consensus --with-secp256k1 --without-openssl --enable-testnet --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
     - if [[ $LINUX && $CLANG && $STATIC  ]]; then ./install.sh --with-secp256k1 --without-openssl --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' LDLIBS='-lstdc++' CXXFLAGS='-Os -stdlib=libstdc++'; fi
-    - if [[ $LINUX && $GCC   && $STATIC  ]]; then ./install.sh --disable-ndebug --disable-shared --build-boost --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix --with-bash-completiondir CFLAGS='-Os -s -static' CXXFLAGS='-Os -s -static'; fi
+    - if [[ $LINUX && $GCC   && $STATIC  ]]; then ./install.sh --build-boost --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix --with-bash-completiondir CFLAGS='-O0 -g -static --coverage' CXXFLAGS='-O0 -g -static --coverage'; fi
     - if [[ $OSX   && $CLANG && $DYNAMIC ]]; then ./install.sh --with-secp256k1 --without-openssl --with-bash-completiondir; fi
     - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-ndebug --disable-static CFLAGS='-Os' LDLIBS='-lstdc++' CXXFLAGS='-Os -stdlib=libstdc++'; fi
     - if [[ $LINUX && $GCC   && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --without-consensus --disable-static --build-boost --with-bash-completiondir CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi

Makefile.am

@@ -57,9 +57,10 @@ if WITH_TESTS
 TESTS = libbitcoin_server_test_runner.sh
 
 check_PROGRAMS = test/libbitcoin_server_test
-test_libbitcoin_server_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_node_CPPFLAGS}
-test_libbitcoin_server_test_LDADD = ${bitcoin_node_LIBS} ${boost_unit_test_framework_LIBS}
+test_libbitcoin_server_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_node_CPPFLAGS} ${sodium_CPPFLAGS} ${czmq___CPPFLAGS}
+test_libbitcoin_server_test_LDADD = src/libbitcoin-server.la ${boost_unit_test_framework_LIBS} ${bitcoin_node_LIBS} ${sodium_LIBS} ${czmq___LIBS}
 test_libbitcoin_server_test_SOURCES = \
+    test/endpoint.cpp \
     test/main.cpp \
     test/server.cpp \
     test/stress.sh

builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj

@@ -110,6 +110,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\test\endpoint.cpp" />
     <ClCompile Include="..\..\..\..\test\main.cpp" />
     <ClCompile Include="..\..\..\..\test\server.cpp" />
   </ItemGroup>

builds/msvc/vs2013/libbitcoin-server-test/libbitcoin-server-test.vcxproj.filters

@@ -15,5 +15,8 @@
     <ClCompile Include="..\..\..\..\test\main.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\endpoint.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

include/bitcoin/server/config/config.hpp

@@ -25,6 +25,7 @@
 #include <vector>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
+#include <bitcoin/server/define.hpp>
 
 namespace libbitcoin {
 namespace server {
@@ -38,7 +39,7 @@ class config_type;
  * Lod configurable vlaues from environment variables, settings file, and
  * command line positional and non-positional options.
  */
-bool load_config(config_type& metadata, std::string& message, int argc,
+bool BCS_API load_config(config_type& metadata, std::string& message, int argc,
     const char* argv[]);
 
 } // namespace server

include/bitcoin/server/config/endpoint.hpp

@@ -25,12 +25,13 @@
 #include <string>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
+#include <bitcoin/server/define.hpp>
 #include <bitcoin/bitcoin.hpp>
 
 namespace libbitcoin {
 namespace server {
 
-class endpoint_type
+class BCS_API endpoint_type
 {
 public:
     endpoint_type();

include/bitcoin/server/config/settings.hpp

@@ -26,6 +26,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 #include <bitcoin/server/config/endpoint.hpp>
+#include <bitcoin/server/define.hpp>
 
 // Not localizable.
 #define BS_HELP_VARIABLE "help"
@@ -41,7 +42,7 @@
 namespace libbitcoin {
 namespace server {
 
-struct settings_type
+struct BCS_API settings_type
 {
     // options
     bool help;
@@ -74,7 +75,7 @@ struct settings_type
     std::vector<endpoint_type> peers;
 };
 
-class config_type
+class BCS_API config_type
 {
 public:
     const boost::program_options::options_description load_settings();

include/bitcoin/server/dispatch.hpp

@@ -21,6 +21,7 @@
 #define LIBBITCOIN_SERVER_DISPATCH_HPP
 
 #include <iostream>
+#include <bitcoin/server/define.hpp>
 
 namespace libbitcoin {
 namespace server {
@@ -38,7 +39,7 @@ enum console_result : int
 /**
  * Dispatch from the command line.
  */
-console_result dispatch(int argc, const char* argv[], std::istream&,
+console_result BCS_API dispatch(int argc, const char* argv[], std::istream&,
     std::ostream& output, std::ostream& error);
 
 } // namespace server

include/bitcoin/server/message.hpp

@@ -22,11 +22,12 @@
 
 #include <czmq++/czmqpp.hpp>
 #include <bitcoin/bitcoin.hpp>
+#include <bitcoin/server/define.hpp>
 
 namespace libbitcoin {
 namespace server {
 
-class incoming_message
+class BCS_API incoming_message
 {
 public:
     bool recv(czmqpp::socket& socket);
@@ -42,7 +43,7 @@ class incoming_message
     bc::data_chunk data_;
 };
 
-class outgoing_message
+class BCS_API outgoing_message
 {
 public:
     // Empty dest = unspecified destination.

include/bitcoin/server/publisher.hpp

@@ -23,12 +23,13 @@
 #include <czmq++/czmqpp.hpp>
 #include <bitcoin/bitcoin.hpp>
 #include <bitcoin/server/config/settings.hpp>
+#include <bitcoin/server/define.hpp>
 #include <bitcoin/server/server_node.hpp>
 
 namespace libbitcoin {
 namespace server {
 
-class publisher
+class BCS_API publisher
 {
 public:
     publisher(server_node& node);