mirror of
https://github.com/jwinterm/wownero.git
synced 2026-11-15 09:13:56 +01:00
Merge pull request #2877
43f5269fWallets now do not depend on the daemon rpc lib (moneromooo-monero)bb89ae8bmove connection_basic and network_throttle from src/p2p to epee (moneromooo-monero)4abf25f3cryptonote_core does not depend on p2p anymore (moneromooo-monero)
This commit is contained in:
@@ -66,7 +66,6 @@ set(daemon_private_headers
|
||||
|
||||
# p2p
|
||||
../p2p/net_node.h
|
||||
../p2p/net_node.inl
|
||||
../p2p/net_node_common.h
|
||||
../p2p/net_peerlist.h
|
||||
../p2p/net_peerlist_boost_serialization.h
|
||||
|
||||
+14
-1
@@ -67,11 +67,24 @@ public:
|
||||
m_core.set_cryptonote_protocol(&protocol);
|
||||
}
|
||||
|
||||
std::string get_config_subdir() const
|
||||
{
|
||||
bool testnet = command_line::get_arg(m_vm_HACK, cryptonote::arg_testnet_on);
|
||||
auto p2p_bind_arg = testnet ? nodetool::arg_testnet_p2p_bind_port : nodetool::arg_p2p_bind_port;
|
||||
std::string port = command_line::get_arg(m_vm_HACK, p2p_bind_arg);
|
||||
if ((!testnet && port != std::to_string(::config::P2P_DEFAULT_PORT))
|
||||
|| (testnet && port != std::to_string(::config::testnet::P2P_DEFAULT_PORT))) {
|
||||
return port;
|
||||
}
|
||||
return std::string();
|
||||
}
|
||||
|
||||
bool run()
|
||||
{
|
||||
//initialize core here
|
||||
MGINFO("Initializing core...");
|
||||
if (!m_core.init(m_vm_HACK))
|
||||
std::string config_subdir = get_config_subdir();
|
||||
if (!m_core.init(m_vm_HACK, config_subdir.empty() ? NULL : config_subdir.c_str()))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
#include "rpc/rpc_args.h"
|
||||
#include "daemon/command_line_args.h"
|
||||
#include "blockchain_db/db_types.h"
|
||||
#include "version.h"
|
||||
|
||||
#ifdef STACK_TRACE
|
||||
#include "common/stack_trace.h"
|
||||
|
||||
Reference in New Issue
Block a user