diff --git a/.gitignore b/.gitignore index 032d0349..eef7f3c2 100644 --- a/.gitignore +++ b/.gitignore @@ -61,7 +61,6 @@ Release # Autogenerated Qt artifacts packaging qrc_resources.cpp -qt_system resources.qrc.depends # Autogenerated Flatbuffers source files diff --git a/coverage/CMakeLists.txt b/coverage/CMakeLists.txt index 26464194..8f1e6143 100644 --- a/coverage/CMakeLists.txt +++ b/coverage/CMakeLists.txt @@ -38,8 +38,7 @@ add_custom_target( '${PROJECT_SOURCE_DIR}/nano/nano_rpc/*' '${PROJECT_SOURCE_DIR}/nano/rpc_test/*' '${PROJECT_SOURCE_DIR}/nano/qt_test/*' '${PROJECT_SOURCE_DIR}/nano/qt/*' - '${PROJECT_SOURCE_DIR}/nano/test_common/*' - '${PROJECT_SOURCE_DIR}/nano/qt_system/*' --output-file + '${PROJECT_SOURCE_DIR}/nano/test_common/*' --output-file ${PROJECT_SOURCE_DIR}/coverage/lcov.info -q WORKING_DIRECTORY ${CMAKE_BINARY_DIR} DEPENDS coverage_tests) diff --git a/nano/qt_system/entry.cpp b/nano/qt_system/entry.cpp deleted file mode 100644 index ae55f0f0..00000000 --- a/nano/qt_system/entry.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include -#include -#include -#include -#include -#include - -#include - -#include -int main (int argc, char ** argv) -{ - nano::force_nano_dev_network (); - nano::node_singleton_memory_pool_purge_guard memory_pool_cleanup_guard; - QApplication application (argc, argv); - QCoreApplication::setOrganizationName ("Nano"); - QCoreApplication::setOrganizationDomain ("nano.org"); - QCoreApplication::setApplicationName ("Nano Wallet"); - nano_qt::eventloop_processor processor; - const uint16_t count (16); - nano::system system (count); - nano::thread_runner runner (system.io_ctx, system.nodes[0]->config.io_threads); - std::unique_ptr client_tabs (new QTabWidget); - std::vector> guis; - for (auto i (0); i < count; ++i) - { - auto wallet (system.nodes[i]->wallets.create (nano::random_wallet_id ())); - nano::keypair key; - wallet->insert_adhoc (key.prv); - guis.push_back (std::make_unique (application, processor, *system.nodes[i], wallet, key.pub)); - client_tabs->addTab (guis.back ()->client_window, boost::str (boost::format ("Wallet %1%") % i).c_str ()); - } - client_tabs->show (); - QObject::connect (&application, &QApplication::aboutToQuit, [&] () { - system.stop (); - }); - int result; - try - { - result = application.exec (); - } - catch (...) - { - result = -1; - debug_assert (false); - } - runner.join (); - return result; -}