Merge branch 'develop' into feature/274/redirect_transaction_fees_to_dividends
This commit is contained in:
commit
b703b12ccc
6 changed files with 19 additions and 11 deletions
|
|
@ -49,6 +49,7 @@ test:
|
||||||
dependencies:
|
dependencies:
|
||||||
- build
|
- build
|
||||||
script:
|
script:
|
||||||
|
- ./build/libraries/fc/tests/all_tests
|
||||||
- ./build/tests/betting_test --log_level=message
|
- ./build/tests/betting_test --log_level=message
|
||||||
- ./build/tests/chain_test --log_level=message
|
- ./build/tests/chain_test --log_level=message
|
||||||
- ./build/tests/cli_test --log_level=message
|
- ./build/tests/cli_test --log_level=message
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,6 @@ LIST(APPEND BOOST_COMPONENTS thread
|
||||||
system
|
system
|
||||||
filesystem
|
filesystem
|
||||||
program_options
|
program_options
|
||||||
signals
|
|
||||||
serialization
|
serialization
|
||||||
chrono
|
chrono
|
||||||
unit_test_framework
|
unit_test_framework
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ Following dependencies are needed for a clean install of Ubuntu 20.04:
|
||||||
```
|
```
|
||||||
sudo apt-get install \
|
sudo apt-get install \
|
||||||
apt-utils autoconf bash build-essential ca-certificates cmake dnsutils \
|
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 \
|
libncurses-dev libreadline-dev libsnappy-dev libssl-dev libtool libzip-dev \
|
||||||
libzmq3-dev locales mc nano net-tools ntp openssh-server pkg-config perl \
|
libzmq3-dev locales mc nano net-tools ntp openssh-server pkg-config perl \
|
||||||
python3 python3-jinja2 sudo wget
|
python3 python3-jinja2 sudo wget
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 86b77c6eb450f97a29c627d3fa9728e25bed933a
|
Subproject commit 1cc740598f5b7ec480ac76f60e19d0ccb1e1ac97
|
||||||
|
|
@ -86,6 +86,8 @@ int main(int argc, char **argv) {
|
||||||
|
|
||||||
bpo::variables_map options;
|
bpo::variables_map options;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
bpo::parsed_options po = bpo::command_line_parser(argc, argv).options(opts).allow_unregistered().run();
|
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);
|
std::vector<std::string> unrecognized = bpo::collect_unrecognized(po.options, bpo::include_positional);
|
||||||
if (unrecognized.size() > 0) {
|
if (unrecognized.size() > 0) {
|
||||||
|
|
@ -96,6 +98,12 @@ int main(int argc, char **argv) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
bpo::store(po, options);
|
bpo::store(po, options);
|
||||||
|
}
|
||||||
|
catch (const boost::program_options::invalid_command_line_syntax & e)
|
||||||
|
{
|
||||||
|
std::cout << e.what() << std::endl;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (options.count("help")) {
|
if (options.count("help")) {
|
||||||
std::cout << opts << "\n";
|
std::cout << opts << "\n";
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
#include <fc/crypto/digest.hpp>
|
#include <fc/crypto/digest.hpp>
|
||||||
|
|
||||||
#include <boost/test/auto_unit_test.hpp>
|
#include <boost/test/unit_test.hpp>
|
||||||
|
|
||||||
using namespace graphene::chain;
|
using namespace graphene::chain;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue