diff options
| author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2024-04-04 22:33:16 +0100 |
|---|---|---|
| committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2024-04-06 14:50:40 +0100 |
| commit | 95a435a9c9d5d0ebec91e7bec5d7d2762ae124ae (patch) | |
| tree | 268dc536d48c901f159d19449e33acaea81ce60f /tests/trezor | |
| parent | net: define IPv4 object explicitly (diff) | |
| download | monero-95a435a9c9d5d0ebec91e7bec5d7d2762ae124ae.tar.xz | |
net: bring consistency between IPv4 port and IPv6 port
* --p2p-bind-port-ipv4 is replaced with --p2p-bind-ipv4-port
* --p2p-bind-port-ipv6 is replaced with --p2p-bind-ipv6-port
Diffstat (limited to 'tests/trezor')
| -rw-r--r-- | tests/trezor/daemon.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/trezor/daemon.cpp b/tests/trezor/daemon.cpp index 308fa6fc0..f35dc3d8e 100644 --- a/tests/trezor/daemon.cpp +++ b/tests/trezor/daemon.cpp @@ -69,7 +69,7 @@ void mock_daemon::default_options(boost::program_options::variables_map & vm) // By default pick non-standard ports to avoid confusion with possibly locally running daemons (mainnet/testnet) const char *test_p2p_port = getenv("TEST_P2P_PORT"); auto p2p_port = std::string(test_p2p_port && strlen(test_p2p_port) > 0 ? test_p2p_port : "61340"); - tools::options::set_option(vm, nodetool::arg_p2p_bind_port_ipv4, po::variable_value(p2p_port, false)); + tools::options::set_option(vm, nodetool::arg_p2p_bind_ipv4_port, po::variable_value(p2p_port, false)); const char *test_rpc_port = getenv("TEST_RPC_PORT"); auto rpc_port = std::string(test_rpc_port && strlen(test_rpc_port) > 0 ? test_rpc_port : "61341"); @@ -85,7 +85,7 @@ void mock_daemon::default_options(boost::program_options::variables_map & vm) void mock_daemon::set_ports(boost::program_options::variables_map & vm, unsigned initial_port) { CHECK_AND_ASSERT_THROW_MES(initial_port < 65535-2, "Invalid port number"); - tools::options::set_option(vm, nodetool::arg_p2p_bind_port_ipv4, po::variable_value(std::to_string(initial_port), false)); + tools::options::set_option(vm, nodetool::arg_p2p_bind_ipv4_port, po::variable_value(std::to_string(initial_port), false)); tools::options::set_option(vm, cryptonote::core_rpc_server::arg_rpc_bind_port, po::variable_value(std::to_string(initial_port + 1), false)); tools::options::set_option(vm, daemon_args::arg_zmq_rpc_bind_port, po::variable_value(std::to_string(initial_port + 2), false)); po::notify(vm); @@ -93,7 +93,7 @@ void mock_daemon::set_ports(boost::program_options::variables_map & vm, unsigned void mock_daemon::load_params(boost::program_options::variables_map const & vm) { - m_p2p_bind_port = command_line::get_arg(vm, nodetool::arg_p2p_bind_port_ipv4); + m_p2p_bind_port = command_line::get_arg(vm, nodetool::arg_p2p_bind_ipv4_port); m_rpc_bind_port = command_line::get_arg(vm, cryptonote::core_rpc_server::arg_rpc_bind_port); m_zmq_bind_port = command_line::get_arg(vm, daemon_args::arg_zmq_rpc_bind_port); m_network_type = command_line::get_arg(vm, cryptonote::arg_testnet_on) ? cryptonote::TESTNET : cryptonote::MAINNET; |