Merge branch 'develop' into feature/274/redirect_transaction_fees_to_dividends

.gitlab-ci.yml

@@ -49,6 +49,7 @@ test:
   dependencies:
     - build
   script:
+    - ./build/libraries/fc/tests/all_tests
     - ./build/tests/betting_test --log_level=message
     - ./build/tests/chain_test --log_level=message
     - ./build/tests/cli_test --log_level=message

CMakeLists.txt

@@ -83,7 +83,6 @@ LIST(APPEND BOOST_COMPONENTS thread
                              system
                              filesystem
                              program_options
-                             signals
                              serialization
                              chrono
                              unit_test_framework

README.md

@@ -12,7 +12,7 @@ Following dependencies are needed for a clean install of Ubuntu 20.04:
 ```
 sudo apt-get install \
     apt-utils autoconf bash build-essential ca-certificates cmake dnsutils \
-    doxygen expect git graphviz libboost1.67-all-dev libbz2-dev libcurl4-openssl-dev \
+    doxygen expect git graphviz libboost-all-dev libbz2-dev libcurl4-openssl-dev \
     libncurses-dev libreadline-dev libsnappy-dev libssl-dev libtool libzip-dev \
     libzmq3-dev locales mc nano net-tools ntp openssh-server pkg-config perl \
     python3 python3-jinja2 sudo wget

libraries/fc

@@ -1 +1 @@
-Subproject commit 86b77c6eb450f97a29c627d3fa9728e25bed933a
+Subproject commit 1cc740598f5b7ec480ac76f60e19d0ccb1e1ac97

programs/cli_wallet/main.cpp

@@ -86,16 +86,24 @@ int main(int argc, char **argv) {
 
       bpo::variables_map options;
 
-      bpo::parsed_options po = bpo::command_line_parser(argc, argv).options(opts).allow_unregistered().run();
-      std::vector<std::string> unrecognized = bpo::collect_unrecognized(po.options, bpo::include_positional);
-      if (unrecognized.size() > 0) {
-         std::cout << "Unknown parameter(s): " << std::endl;
-         for (auto s : unrecognized) {
-            std::cout << "  " << s << std::endl;
+      try
+      {
+         bpo::parsed_options po = bpo::command_line_parser(argc, argv).options(opts).allow_unregistered().run();
+         std::vector<std::string> unrecognized = bpo::collect_unrecognized(po.options, bpo::include_positional);
+         if (unrecognized.size() > 0) {
+            std::cout << "Unknown parameter(s): " << std::endl;
+            for (auto s : unrecognized) {
+               std::cout << "  " << s << std::endl;
+            }
+            return 0;
          }
+         bpo::store(po, options);
+      }
+      catch (const boost::program_options::invalid_command_line_syntax & e)
+      {
+         std::cout << e.what() << std::endl;
          return 0;
       }
-      bpo::store(po, options);
 
       if (options.count("help")) {
          std::cout << opts << "\n";

tests/benchmarks/genesis_allocation.cpp

@@ -27,7 +27,7 @@
 
 #include <fc/crypto/digest.hpp>
 
-#include <boost/test/auto_unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace graphene::chain;