Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-21 09:38:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3982

Browse source 
08b85a8 cryptonote_config: add get_config to refactor x = testnet ? config::testnet::X : stagenet ? config::stagenet::X : config::X (stoffu)
0cf80ba net_node: resolve host for node addresses given via command line flags (stoffu)
This commit is contained in:
luigi1111 2018-06-27 15:38:23 -05:00
commit 3ad4ecd4ff
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
6 changed files with 113 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/simplewallet/simplewallet.cpp
View file

@ -3880,7 +3880,7 @@ bool simple_wallet::set_daemon(const std::vector<std::string>& args)
// If no port has been provided, use the default from config
if (!match[3].length())
{
int daemon_port = m_wallet->nettype() == cryptonote::TESTNET ? config::testnet::RPC_DEFAULT_PORT : m_wallet->nettype() == cryptonote::STAGENET ? config::stagenet::RPC_DEFAULT_PORT : config::RPC_DEFAULT_PORT;
int daemon_port = get_config(m_wallet->nettype()).RPC_DEFAULT_PORT;
daemon_url = match[1] + match[2] + std::string(":") + std::to_string(daemon_port);
} else {
daemon_url = args[0];