mirror of
https://github.com/wownero/wownero.git
synced 2026-10-17 07:31:35 +02:00
daemon: remove miniupnp
(cherry picked from commit 987e6d29133a493914a19b660051ca634fbed1d6)
This commit is contained in:
@@ -36,8 +36,6 @@ set(TEST_DATA_DIR "${CMAKE_CURRENT_LIST_DIR}/data")
|
||||
|
||||
if (WIN32 AND STATIC)
|
||||
add_definitions(-DSTATICLIB)
|
||||
# miniupnp changed their static define
|
||||
add_definitions(-DMINIUPNP_STATICLIB)
|
||||
endif ()
|
||||
|
||||
find_package(GTest)
|
||||
|
||||
@@ -48,7 +48,7 @@ WALLET_DIRECTORY = builddir + "/functional-tests-directory"
|
||||
FUNCTIONAL_TESTS_DIRECTORY = builddir + "/tests/functional_tests"
|
||||
DIFFICULTY = 10
|
||||
|
||||
monerod_base = [builddir + "/bin/monerod", "--regtest", "--fixed-difficulty", str(DIFFICULTY), "--no-igd", "--p2p-bind-port", "monerod_p2p_port", "--rpc-bind-port", "monerod_rpc_port", "--zmq-rpc-bind-port", "monerod_zmq_port", "--zmq-pub", "monerod_zmq_pub", "--non-interactive", "--disable-dns-checkpoints", "--check-updates", "disabled", "--rpc-ssl", "disabled", "--data-dir", "monerod_data_dir", "--log-level", "1", "--rpc-max-connections-per-private-ip", "100", "--rpc-max-connections", "100"]
|
||||
monerod_base = [builddir + "/bin/monerod", "--regtest", "--fixed-difficulty", str(DIFFICULTY), "--p2p-bind-port", "monerod_p2p_port", "--rpc-bind-port", "monerod_rpc_port", "--zmq-rpc-bind-port", "monerod_zmq_port", "--zmq-pub", "monerod_zmq_pub", "--non-interactive", "--disable-dns-checkpoints", "--check-updates", "disabled", "--rpc-ssl", "disabled", "--data-dir", "monerod_data_dir", "--log-level", "1", "--rpc-max-connections-per-private-ip", "100", "--rpc-max-connections", "100"]
|
||||
monerod_extra = [
|
||||
["--offline"],
|
||||
["--rpc-payment-address", "44SKxxLQw929wRF6BA9paQ1EWFshNnKhXM3qz6Mo3JGDE2YG3xyzVutMStEicxbQGRfrYvAAYxH6Fe8rnD56EaNwUiqhcwR", "--rpc-payment-difficulty", str(DIFFICULTY), "--rpc-payment-credits", "5000", "--offline"],
|
||||
|
||||
@@ -56,7 +56,6 @@ void mock_daemon::default_options(boost::program_options::variables_map & vm)
|
||||
tools::options::set_option(vm, nodetool::arg_p2p_add_exclusive_node, po::variable_value(exclusive_nodes, false));
|
||||
|
||||
tools::options::set_option(vm, nodetool::arg_p2p_bind_ip, po::variable_value(std::string("127.0.0.1"), false));
|
||||
tools::options::set_option(vm, nodetool::arg_no_igd, po::variable_value(true, false));
|
||||
tools::options::set_option(vm, cryptonote::arg_offline, po::variable_value(true, false));
|
||||
tools::options::set_option(vm, "disable-dns-checkpoints", po::variable_value(true, false));
|
||||
|
||||
|
||||
@@ -181,7 +181,6 @@ namespace
|
||||
std::vector<std::string> args{
|
||||
"--regtest",
|
||||
"--p2p-bind-ip=127.0.0.1",
|
||||
"--no-igd",
|
||||
"--out-peers=0",
|
||||
"--in-peers=0",
|
||||
"--data-dir",
|
||||
@@ -1292,7 +1291,6 @@ TEST(node_server, race_condition)
|
||||
"--out-peers=0",
|
||||
"--data-dir",
|
||||
dir.string(),
|
||||
"--no-igd",
|
||||
"--add-exclusive-node=127.0.0.1:48080",
|
||||
"--check-updates=disabled",
|
||||
"--disable-dns-checkpoints",
|
||||
|
||||
Reference in New Issue
Block a user