aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-02-09 21:29:35 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-02-21 09:35:23 +0000
commite74b3ab5f720253f88b06de15fa1b5199e7cdeeb (patch)
treeab3c5290a0a8b3ffa3d3a79bee1488f43450c061 /src/cryptonote_core
parentMerge pull request #1747 (diff)
downloadmonero-e74b3ab5f720253f88b06de15fa1b5199e7cdeeb.tar.xz
core: add p2p bind port options from net_node
They're now used by core to determine the data directory to use for the txpool directory. This fixes an assert in the core tests, which don't use the RPC server, which normally initializes the P2P code.
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index fc34b3adc..73f01559d 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -151,6 +151,10 @@ namespace cryptonote
command_line::add_arg(desc, command_line::arg_show_time_stats);
command_line::add_arg(desc, command_line::arg_block_sync_size);
command_line::add_arg(desc, command_line::arg_check_updates);
+
+ // we now also need some of net_node's options (p2p bind arg, for separate data dir)
+ command_line::add_arg(desc, nodetool::arg_testnet_p2p_bind_port, false);
+ command_line::add_arg(desc, nodetool::arg_p2p_bind_port, false);
}
//-----------------------------------------------------------------------------------------------
bool core::handle_command_line(const boost::program_options::variables_map& vm)