From 5860002d0ae2535a36865d5e0157566f81137ea8 Mon Sep 17 00:00:00 2001 From: serkixenos Date: Wed, 16 Feb 2022 18:01:29 -0400 Subject: [PATCH] Code formatting --- clang-format.sh | 1 + .../sidechain_net_handler_bitcoin.cpp | 6 +- programs/cli_wallet/main.cpp | 223 ++++++++---------- 3 files changed, 104 insertions(+), 126 deletions(-) diff --git a/clang-format.sh b/clang-format.sh index 3fbbf055..7f448285 100755 --- a/clang-format.sh +++ b/clang-format.sh @@ -3,3 +3,4 @@ find ./libraries/app -regex ".*[c|h]pp" | xargs clang-format -i find ./libraries/chain/hardfork.d -regex ".*hf" | xargs clang-format -i find ./libraries/plugins/peerplays_sidechain -regex ".*[c|h]pp" | xargs clang-format -i +find ./programs/cli_wallet -regex ".*[c|h]pp" | xargs clang-format -i diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index 2ae58613..04a0e604 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -874,8 +874,8 @@ std::vector zmq_listener::receive_multipart() { auto res = zmq::recv_multipart(socket, std::back_inserter(msgs)); FC_ASSERT(res); if (3 != *res) { - elog("zmq::recv_multipart returned: ${res}", ("res", *res)); - throw zmq::error_t(); + elog("zmq::recv_multipart returned: ${res}", ("res", *res)); + throw zmq::error_t(); } return msgs; @@ -897,7 +897,7 @@ void zmq_listener::handle_zmq() { const auto block_hash = boost::algorithm::hex(std::string(static_cast(msg[1].data()), msg[1].size())); event_received(block_hash); } catch (zmq::error_t &e) { - elog("handle_zmq recv_multipart exception ${str}", ("str", e.what())); + elog("handle_zmq recv_multipart exception ${str}", ("str", e.what())); } } } diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp index d4e1d1ba..a0449ce0 100644 --- a/programs/cli_wallet/main.cpp +++ b/programs/cli_wallet/main.cpp @@ -27,8 +27,18 @@ #include #include +#include +#include +#include +#include + +#include #include #include +#include +#include +#include +#include #include #include #include @@ -40,26 +50,14 @@ #include #include #include +#include #include #include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - #ifdef WIN32 -# include +#include #else -# include +#include #endif using namespace graphene::app; @@ -69,24 +67,22 @@ using namespace graphene::wallet; using namespace std; namespace bpo = boost::program_options; -int main( int argc, char** argv ) -{ +int main(int argc, char **argv) { try { boost::program_options::options_description opts; - opts.add_options() - ("help,h", "Print this help message and exit.") - ("version,v", "Display the version info and exit") - ("server-rpc-endpoint,s", bpo::value()->implicit_value("ws://127.0.0.1:8090"), "Server websocket RPC endpoint") - ("server-rpc-user,u", bpo::value(), "Server Username") - ("server-rpc-password,p", bpo::value(), "Server Password") - ("rpc-endpoint,r", bpo::value()->implicit_value("127.0.0.1:8091"), "Endpoint for wallet websocket RPC to listen on") - ("rpc-tls-endpoint,t", bpo::value()->implicit_value("127.0.0.1:8092"), "Endpoint for wallet websocket TLS RPC to listen on") - ("rpc-tls-certificate,c", bpo::value()->implicit_value("server.pem"), "PEM certificate for wallet websocket TLS RPC") - ("rpc-http-endpoint,H", bpo::value()->implicit_value("127.0.0.1:8093"), "Endpoint for wallet HTTP RPC to listen on") - ("daemon,d", "Run the wallet in daemon mode" ) - ("wallet-file,w", bpo::value()->implicit_value("wallet.json"), "wallet to load") - ("chain-id", bpo::value(), "chain ID to connect to"); + opts.add_options()("help,h", "Print this help message and exit."); + opts.add_options()("version,v", "Display the version info and exit"); + opts.add_options()("server-rpc-endpoint,s", bpo::value()->implicit_value("ws://127.0.0.1:8090"), "Server websocket RPC endpoint"); + opts.add_options()("server-rpc-user,u", bpo::value(), "Server Username"); + opts.add_options()("server-rpc-password,p", bpo::value(), "Server Password"); + opts.add_options()("rpc-endpoint,r", bpo::value()->implicit_value("127.0.0.1:8091"), "Endpoint for wallet websocket RPC to listen on"); + opts.add_options()("rpc-tls-endpoint,t", bpo::value()->implicit_value("127.0.0.1:8092"), "Endpoint for wallet websocket TLS RPC to listen on"); + opts.add_options()("rpc-tls-certificate,c", bpo::value()->implicit_value("server.pem"), "PEM certificate for wallet websocket TLS RPC"); + opts.add_options()("rpc-http-endpoint,H", bpo::value()->implicit_value("127.0.0.1:8093"), "Endpoint for wallet HTTP RPC to listen on"); + opts.add_options()("daemon,d", "Run the wallet in daemon mode"); + opts.add_options()("wallet-file,w", bpo::value()->implicit_value("wallet.json"), "wallet to load"); + opts.add_options()("chain-id", bpo::value(), "chain ID to connect to"); bpo::variables_map options; @@ -99,20 +95,18 @@ int main( int argc, char** argv ) } return 0; } - bpo::store( po, options ); + bpo::store(po, options); - if( options.count("help") ) - { + if (options.count("help")) { std::cout << opts << "\n"; return 0; } - if (options.count("version")) - { + if (options.count("version")) { std::string wallet_version(graphene::utilities::git_revision_description); const size_t pos = wallet_version.find('/'); - if( pos != std::string::npos && wallet_version.size() > pos ) - wallet_version = wallet_version.substr( pos + 1 ); + if (pos != std::string::npos && wallet_version.size() > pos) + wallet_version = wallet_version.substr(pos + 1); std::cout << "Version: " << wallet_version << "\n"; std::cout << "Git Revision: " << graphene::utilities::git_revision_sha << "\n"; std::cout << "Built: " << __DATE__ " at " __TIME__ << "\n"; @@ -126,33 +120,33 @@ int main( int argc, char** argv ) fc::path log_dir = data_dir / "logs"; fc::file_appender::config ac; - ac.filename = log_dir / "rpc" / "rpc.log"; - ac.flush = true; - ac.rotate = true; - ac.rotation_interval = fc::hours( 1 ); - ac.rotation_limit = fc::days( 1 ); + ac.filename = log_dir / "rpc" / "rpc.log"; + ac.flush = true; + ac.rotate = true; + ac.rotation_interval = fc::hours(1); + ac.rotation_limit = fc::days(1); std::cout << "Logging RPC to file: " << (data_dir / ac.filename).preferred_string() << "\n"; - cfg.appenders.push_back(fc::appender_config( "default", "console", fc::variant(fc::console_appender::config(), 20))); - cfg.appenders.push_back(fc::appender_config( "rpc", "file", fc::variant(ac, 5))); + cfg.appenders.push_back(fc::appender_config("default", "console", fc::variant(fc::console_appender::config(), 20))); + cfg.appenders.push_back(fc::appender_config("rpc", "file", fc::variant(ac, 5))); - cfg.loggers = { fc::logger_config("default"), fc::logger_config( "rpc") }; + cfg.loggers = {fc::logger_config("default"), fc::logger_config("rpc")}; cfg.loggers.front().level = fc::log_level::warn; cfg.loggers.front().appenders = {"default"}; cfg.loggers.back().level = fc::log_level::info; cfg.loggers.back().appenders = {"rpc"}; - fc::configure_logging( cfg ); + fc::configure_logging(cfg); fc::ecc::private_key committee_private_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key"))); - idump( (key_to_wif( committee_private_key ) ) ); + idump((key_to_wif(committee_private_key))); fc::ecc::private_key nathan_private_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("nathan"))); public_key_type nathan_pub_key = nathan_private_key.get_public_key(); - idump( (nathan_pub_key) ); - idump( (key_to_wif( nathan_private_key ) ) ); + idump((nathan_pub_key)); + idump((key_to_wif(nathan_private_key))); // // TODO: We read wallet_data twice, once in main() to grab the @@ -162,153 +156,136 @@ int main( int argc, char** argv ) // wallet_data wdata; - fc::path wallet_file( options.count("wallet-file") ? options.at("wallet-file").as() : "wallet.json"); - if( fc::exists( wallet_file ) ) - { - wdata = fc::json::from_file( wallet_file ).as( GRAPHENE_MAX_NESTED_OBJECTS ); - if( options.count("chain-id") ) - { + fc::path wallet_file(options.count("wallet-file") ? options.at("wallet-file").as() : "wallet.json"); + if (fc::exists(wallet_file)) { + wdata = fc::json::from_file(wallet_file).as(GRAPHENE_MAX_NESTED_OBJECTS); + if (options.count("chain-id")) { // the --chain-id on the CLI must match the chain ID embedded in the wallet file - if( chain_id_type(options.at("chain-id").as()) != wdata.chain_id ) - { + if (chain_id_type(options.at("chain-id").as()) != wdata.chain_id) { std::cout << "Chain ID in wallet file does not match specified chain ID\n"; return 1; } } - } - else - { - if( options.count("chain-id") ) - { + } else { + if (options.count("chain-id")) { wdata.chain_id = chain_id_type(options.at("chain-id").as()); std::cout << "Starting a new wallet with chain ID " << wdata.chain_id.str() << " (from CLI)\n"; - } - else - { + } else { wdata.chain_id = graphene::egenesis::get_egenesis_chain_id(); std::cout << "Starting a new wallet with chain ID " << wdata.chain_id.str() << " (from egenesis)\n"; } } // but allow CLI to override - if( options.count("server-rpc-endpoint") ) + if (options.count("server-rpc-endpoint")) wdata.ws_server = options.at("server-rpc-endpoint").as(); - if( options.count("server-rpc-user") ) + if (options.count("server-rpc-user")) wdata.ws_user = options.at("server-rpc-user").as(); - if( options.count("server-rpc-password") ) + if (options.count("server-rpc-password")) wdata.ws_password = options.at("server-rpc-password").as(); fc::http::websocket_client client; idump((wdata.ws_server)); - auto con = client.connect( wdata.ws_server ); + auto con = client.connect(wdata.ws_server); auto apic = std::make_shared(con, GRAPHENE_MAX_NESTED_OBJECTS); - auto remote_api = apic->get_remote_api< login_api >(1); - edump((wdata.ws_user)(wdata.ws_password) ); - FC_ASSERT( remote_api->login( wdata.ws_user, wdata.ws_password ), "Failed to log in to API server" ); + auto remote_api = apic->get_remote_api(1); + edump((wdata.ws_user)(wdata.ws_password)); + FC_ASSERT(remote_api->login(wdata.ws_user, wdata.ws_password), "Failed to log in to API server"); - auto wapiptr = std::make_shared( wdata, remote_api ); - wapiptr->set_wallet_filename( wallet_file.generic_string() ); + auto wapiptr = std::make_shared(wdata, remote_api); + wapiptr->set_wallet_filename(wallet_file.generic_string()); wapiptr->load_wallet_file(); fc::api wapi(wapiptr); - auto wallet_cli = std::make_shared( GRAPHENE_MAX_NESTED_OBJECTS ); - for( auto& name_formatter : wapiptr->get_result_formatters() ) - wallet_cli->format_result( name_formatter.first, name_formatter.second ); + auto wallet_cli = std::make_shared(GRAPHENE_MAX_NESTED_OBJECTS); + for (auto &name_formatter : wapiptr->get_result_formatters()) + wallet_cli->format_result(name_formatter.first, name_formatter.second); - boost::signals2::scoped_connection closed_connection(con->closed.connect([wallet_cli]{ + boost::signals2::scoped_connection closed_connection(con->closed.connect([wallet_cli] { cerr << "Server has disconnected us.\n"; wallet_cli->stop(); })); (void)(closed_connection); - if( wapiptr->is_new() ) - { + if (wapiptr->is_new()) { std::cout << "Please use the set_password method to initialize a new wallet before continuing\n"; - wallet_cli->set_prompt( "new >>> " ); + wallet_cli->set_prompt("new >>> "); } else - wallet_cli->set_prompt( "locked >>> " ); + wallet_cli->set_prompt("locked >>> "); boost::signals2::scoped_connection locked_connection(wapiptr->lock_changed.connect([&](bool locked) { - wallet_cli->set_prompt( locked ? "locked >>> " : "unlocked >>> " ); + wallet_cli->set_prompt(locked ? "locked >>> " : "unlocked >>> "); })); std::shared_ptr _websocket_server; - if( options.count("rpc-endpoint") ) - { + if (options.count("rpc-endpoint")) { _websocket_server = std::make_shared(); - _websocket_server->on_connection([&wapi]( const fc::http::websocket_connection_ptr& c ){ + _websocket_server->on_connection([&wapi](const fc::http::websocket_connection_ptr &c) { std::cout << "here... \n"; - wlog("." ); + wlog("."); auto wsc = std::make_shared(c, GRAPHENE_MAX_NESTED_OBJECTS); wsc->register_api(wapi); - c->set_session_data( wsc ); + c->set_session_data(wsc); }); - ilog( "Listening for incoming RPC requests on ${p}", ("p", options.at("rpc-endpoint").as() )); - _websocket_server->listen( fc::ip::endpoint::from_string(options.at("rpc-endpoint").as()) ); + ilog("Listening for incoming RPC requests on ${p}", ("p", options.at("rpc-endpoint").as())); + _websocket_server->listen(fc::ip::endpoint::from_string(options.at("rpc-endpoint").as())); _websocket_server->start_accept(); } string cert_pem = "server.pem"; - if( options.count( "rpc-tls-certificate" ) ) + if (options.count("rpc-tls-certificate")) cert_pem = options.at("rpc-tls-certificate").as(); std::shared_ptr _websocket_tls_server; - if( options.count("rpc-tls-endpoint") ) - { + if (options.count("rpc-tls-endpoint")) { _websocket_tls_server = std::make_shared(cert_pem); - _websocket_tls_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){ + _websocket_tls_server->on_connection([&](const fc::http::websocket_connection_ptr &c) { auto wsc = std::make_shared(c, GRAPHENE_MAX_NESTED_OBJECTS); wsc->register_api(wapi); - c->set_session_data( wsc ); + c->set_session_data(wsc); }); - ilog( "Listening for incoming TLS RPC requests on ${p}", ("p", options.at("rpc-tls-endpoint").as() )); - _websocket_tls_server->listen( fc::ip::endpoint::from_string(options.at("rpc-tls-endpoint").as()) ); + ilog("Listening for incoming TLS RPC requests on ${p}", ("p", options.at("rpc-tls-endpoint").as())); + _websocket_tls_server->listen(fc::ip::endpoint::from_string(options.at("rpc-tls-endpoint").as())); _websocket_tls_server->start_accept(); } auto _http_server = std::make_shared(); - if( options.count("rpc-http-endpoint" ) ) - { - ilog( "Listening for incoming HTTP RPC requests on ${p}", ("p", options.at("rpc-http-endpoint").as() ) ); - _http_server->listen( fc::ip::endpoint::from_string( options.at( "rpc-http-endpoint" ).as() ) ); + if (options.count("rpc-http-endpoint")) { + ilog("Listening for incoming HTTP RPC requests on ${p}", ("p", options.at("rpc-http-endpoint").as())); + _http_server->listen(fc::ip::endpoint::from_string(options.at("rpc-http-endpoint").as())); // // due to implementation, on_request() must come AFTER listen() // _http_server->on_request( - [&wapi]( const fc::http::request& req, const fc::http::server::response& resp ) - { - std::shared_ptr< fc::rpc::http_api_connection > conn = - std::make_shared< fc::rpc::http_api_connection >( GRAPHENE_MAX_NESTED_OBJECTS ); - conn->register_api( wapi ); - conn->on_request( req, resp ); - } ); + [&wapi](const fc::http::request &req, const fc::http::server::response &resp) { + std::shared_ptr conn = + std::make_shared(GRAPHENE_MAX_NESTED_OBJECTS); + conn->register_api(wapi); + conn->on_request(req, resp); + }); } - if( !options.count( "daemon" ) ) - { - wallet_cli->register_api( wapi ); + if (!options.count("daemon")) { + wallet_cli->register_api(wapi); wallet_cli->start(); wallet_cli->wait(); - } - else - { - fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); - fc::set_signal_handler([&exit_promise](int signal) { - exit_promise->set_value(signal); - }, SIGINT); + } else { + fc::promise::ptr exit_promise = new fc::promise("UNIX Signal Handler"); + fc::set_signal_handler([&exit_promise](int signal) { + exit_promise->set_value(signal); + }, + SIGINT); - ilog( "Entering Daemon Mode, ^C to exit" ); - exit_promise->wait(); + ilog("Entering Daemon Mode, ^C to exit"); + exit_promise->wait(); } wapi->save_wallet_file(wallet_file.generic_string()); locked_connection.disconnect(); closed_connection.disconnect(); - } - catch ( const fc::exception& e ) - { + } catch (const fc::exception &e) { std::cout << e.to_detail_string() << "\n"; return -1; }