diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:59:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-17 12:59:44 +0200 |
| commit | 066fd7aced8ff0079271bae1295355d741f2ea7b (patch) | |
| tree | e8056ad1f87ed1d9fc695e68c87bb5adc2700d52 /tests/core_proxy/core_proxy.cpp | |
| parent | b806d9844e4cfdb94e7a2d175efdf41d5ad480ff (diff) | |
| parent | 43f5269f842cbdc585226eea20e48d19253f61e7 (diff) | |
| download | monzero-core-066fd7aced8ff0079271bae1295355d741f2ea7b.tar.gz monzero-core-066fd7aced8ff0079271bae1295355d741f2ea7b.tar.xz monzero-core-066fd7aced8ff0079271bae1295355d741f2ea7b.zip | |
Merge pull request #2877
43f5269f Wallets now do not depend on the daemon rpc lib (moneromooo-monero)
bb89ae8b move connection_basic and network_throttle from src/p2p to epee (moneromooo-monero)
4abf25f3 cryptonote_core does not depend on p2p anymore (moneromooo-monero)
Diffstat (limited to 'tests/core_proxy/core_proxy.cpp')
| -rw-r--r-- | tests/core_proxy/core_proxy.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/core_proxy/core_proxy.cpp b/tests/core_proxy/core_proxy.cpp index fd07a5d2e..d6c89fc39 100644 --- a/tests/core_proxy/core_proxy.cpp +++ b/tests/core_proxy/core_proxy.cpp @@ -42,8 +42,10 @@ #include "common/command_line.h" #include "console_handler.h" #include "p2p/net_node.h" +#include "p2p/net_node.inl" //#include "cryptonote_core/cryptonote_core.h" #include "cryptonote_protocol/cryptonote_protocol_handler.h" +#include "cryptonote_protocol/cryptonote_protocol_handler.inl" #include "core_proxy.h" #include "version.h" |