diff --git a/src/common/command_line.cpp b/src/common/command_line.cpp index 6595763f..c3a9b057 100644 --- a/src/common/command_line.cpp +++ b/src/common/command_line.cpp @@ -10,36 +10,36 @@ namespace command_line { - const arg_descriptor arg_help = {"help", "Produce help message"}; - const arg_descriptor arg_version = {"version", "Output version information"}; - const arg_descriptor arg_data_dir = {"data-dir", "Specify data directory", ""}; + const arg_descriptor arg_help ("help", "Produce help message"); + const arg_descriptor arg_version ("version", "Output version information"); + const arg_descriptor arg_data_dir ("data-dir", "Specify data directory", ""); - const arg_descriptor arg_stop_after_height = { "stop-after-height", "If specified, the daemon will stop immediately after a block with the given height is added", 0 }; + const arg_descriptor arg_stop_after_height ( "stop-after-height", "If specified, the daemon will stop immediately after a block with the given height is added", 0 ); - const arg_descriptor arg_config_file = { "config-file", "Specify configuration file", std::string(CURRENCY_NAME_SHORT ".conf") }; - const arg_descriptor arg_os_version = { "os-version", "" }; + const arg_descriptor arg_config_file ( "config-file", "Specify configuration file", std::string(CURRENCY_NAME_SHORT ".conf") ); + const arg_descriptor arg_os_version ( "os-version", "" ); - const arg_descriptor arg_log_dir = { "log-dir", "", "", true}; - const arg_descriptor arg_log_file = { "log-file", "", "" }; - const arg_descriptor arg_log_level = { "log-level", "", LOG_LEVEL_0, true }; + const arg_descriptor arg_log_dir ( "log-dir", ""); + const arg_descriptor arg_log_file ( "log-file", "", ""); + const arg_descriptor arg_log_level ( "log-level", ""); - const arg_descriptor arg_console = { "no-console", "Disable daemon console commands" }; - const arg_descriptor arg_show_details = { "currency-details", "Display currency details" }; - const arg_descriptor arg_show_rpc_autodoc = { "show_rpc_autodoc", "Display rpc auto-generated documentation template" }; + const arg_descriptor arg_console ( "no-console", "Disable daemon console commands" ); + const arg_descriptor arg_show_details ( "currency-details", "Display currency details" ); + const arg_descriptor arg_show_rpc_autodoc ( "show_rpc_autodoc", "Display rpc auto-generated documentation template" ); - const arg_descriptor arg_disable_upnp = { "disable-upnp", "Disable UPnP (enhances local network privacy)", false, true }; - const arg_descriptor arg_disable_ntp = { "disable-ntp", "Disable NTP, could enhance to time synchronization issue but increase network privacy, consider using disable-stop-if-time-out-of-sync with it", false, true }; + const arg_descriptor arg_disable_upnp ( "disable-upnp", "Disable UPnP (enhances local network privacy)"); + const arg_descriptor arg_disable_ntp ( "disable-ntp", "Disable NTP, could enhance to time synchronization issue but increase network privacy, consider using disable-stop-if-time-out-of-sync with it"); - const arg_descriptor arg_disable_stop_if_time_out_of_sync = { "disable-stop-if-time-out-of-sync", "Do not stop the daemon if serious time synchronization problem is detected", false, true }; - const arg_descriptor arg_disable_stop_on_low_free_space = { "disable-stop-on-low-free-space", "Do not stop the daemon if free space at data dir is critically low", false, true }; - const arg_descriptor arg_enable_offers_service = { "enable-offers-service", "Enables marketplace feature", false, false}; - const arg_descriptor arg_db_engine = { "db-engine", "Specify database engine for storage. May be \"lmdb\"(default) or \"mdbx\"", ARG_DB_ENGINE_LMDB, false }; + const arg_descriptor arg_disable_stop_if_time_out_of_sync ( "disable-stop-if-time-out-of-sync", "Do not stop the daemon if serious time synchronization problem is detected"); + const arg_descriptor arg_disable_stop_on_low_free_space ( "disable-stop-on-low-free-space", "Do not stop the daemon if free space at data dir is critically low"); + const arg_descriptor arg_enable_offers_service ( "enable-offers-service", "Enables marketplace feature", false); + const arg_descriptor arg_db_engine ( "db-engine", "Specify database engine for storage. May be \"lmdb\"(default) or \"mdbx\"", ARG_DB_ENGINE_LMDB ); - const arg_descriptor arg_no_predownload = { "no-predownload", "Do not pre-download blockchain database", }; - const arg_descriptor arg_force_predownload = { "force-predownload", "Pre-download blockchain database regardless of it's status", }; - const arg_descriptor arg_validate_predownload = { "validate-predownload", "Paranoid mode, re-validate each block from pre-downloaded database and rebuild own database", }; - const arg_descriptor arg_predownload_link = { "predownload-link", "Override url for blockchain database pre-downloading", "", true }; + const arg_descriptor arg_no_predownload ( "no-predownload", "Do not pre-download blockchain database", ); + const arg_descriptor arg_force_predownload ( "force-predownload", "Pre-download blockchain database regardless of it's status", ); + const arg_descriptor arg_validate_predownload ( "validate-predownload", "Paranoid mode, re-validate each block from pre-downloaded database and rebuild own database", ); + const arg_descriptor arg_predownload_link ( "predownload-link", "Override url for blockchain database pre-downloading"); - const arg_descriptor arg_deeplink = { "deeplink-params", "Deeplink parameter, in that case app just forward params to running app", "", true }; + const arg_descriptor arg_deeplink ( "deeplink-params", "Deeplink parameter, in that case app just forward params to running app"); } diff --git a/src/common/command_line.h b/src/common/command_line.h index 652d1777..3d9107dc 100644 --- a/src/common/command_line.h +++ b/src/common/command_line.h @@ -26,27 +26,28 @@ namespace command_line arg_descriptor(const char* _name, const char* _description): name(_name), description(_description), - not_use_default(true), + use_default(false), default_value(T()) {} arg_descriptor(const char* _name, const char* _description, const T& default_val) : name(_name), description(_description), - not_use_default(false), + use_default(true), default_value(default_val) {} - arg_descriptor(const char* _name, const char* _description, const T& default_val, bool not_use_default) : - name(_name), - description(_description), - default_value(default_val), - not_use_default(not_use_default) - {} +// arg_descriptor(const char* _name, const char* _description, const T& default_val, bool not_use_default) : +// name(_name), +// description(_description), +// default_value(default_val), +// not_use_default(not_use_default) +// {} + const char* name; const char* description; + bool use_default; T default_value; - bool not_use_default; }; template @@ -79,7 +80,7 @@ namespace command_line boost::program_options::typed_value* make_semantic(const arg_descriptor& arg) { auto semantic = boost::program_options::value(); - if (!arg.not_use_default) + if (arg.use_default) semantic->default_value(arg.default_value); return semantic; } @@ -88,7 +89,7 @@ namespace command_line boost::program_options::typed_value* make_semantic(const arg_descriptor& arg, const T& def) { auto semantic = boost::program_options::value(); - if (!arg.not_use_default) + if (arg.use_default) semantic->default_value(def); return semantic; } diff --git a/src/connectivity_tool/conn_tool.cpp b/src/connectivity_tool/conn_tool.cpp index 33ea6bd9..1ee022b3 100644 --- a/src/connectivity_tool/conn_tool.cpp +++ b/src/connectivity_tool/conn_tool.cpp @@ -38,32 +38,32 @@ using namespace nodetool; namespace { - const command_line::arg_descriptor arg_ip = {"ip", "set ip", "127.0.0.1", false}; - const command_line::arg_descriptor arg_port = {"port", "set port"}; - const command_line::arg_descriptor arg_rpc_port = {"rpc-port", "set rpc port", RPC_DEFAULT_PORT, false}; - const command_line::arg_descriptor arg_timeout = {"timeout", "set timeout", 5000, false}; - const command_line::arg_descriptor arg_priv_key = {"private-key", "private key to subscribe debug command", "", true}; - const command_line::arg_descriptor arg_peer_id = {"peer-id", "peerid if known(if not - will be requested)", 0}; - const command_line::arg_descriptor arg_generate_keys = {"generate-keys-pair", "generate private and public keys pair"}; - const command_line::arg_descriptor arg_request_stat_info = {"request-stat-info", "request statistics information"}; - const command_line::arg_descriptor arg_log_journal_len = { "log-journal-len", "Specify length of list of last error messages in log", 0, true }; - const command_line::arg_descriptor arg_request_net_state = {"request-net-state", "request network state information (peer list, connections count)"}; - const command_line::arg_descriptor arg_get_daemon_info = {"rpc-get-daemon-info", "request daemon state info vie rpc (--rpc-port option should be set ).", "", true}; - const command_line::arg_descriptor arg_get_aliases = {"rpc-get-aliases", "request daemon aliases all list", "", true}; - const command_line::arg_descriptor arg_increment_build_no = { "increment-build-no", "Increment build nimber", "", true }; - const command_line::arg_descriptor arg_upate_maintainers_info = {"update-maintainers-info", "Push maintainers info into the network, update-maintainers-info=file-with-info.json", "", true}; - const command_line::arg_descriptor arg_update_build_no = {"update-build-no", "Updated version number in version template file", "", true}; - const command_line::arg_descriptor arg_generate_genesis = {"generate-genesis", "Generate genesis coinbase based on config file", "", true }; - const command_line::arg_descriptor arg_genesis_split_amount = { "genesis-split-amount", "Set split amount for generating genesis block", 0, true }; - const command_line::arg_descriptor arg_get_info_flags = { "getinfo-flags-hex", "Set of bits for rpc-get-daemon-info", "", true }; - const command_line::arg_descriptor arg_set_peer_log_level = { "set-peer-log-level", "Set log level for remote peer", 0, true }; - const command_line::arg_descriptor arg_download_peer_log = { "download-peer-log", "Download log from remote peer [,]", "", true }; - const command_line::arg_descriptor arg_do_consloe_log = { "do-console-log", "Tool generates debug console output(debug purposes)", "", true }; - const command_line::arg_descriptor arg_generate_integrated_address = { "generate-integrated-address", "Tool create integrated address from simple address and payment_id", "", true }; - const command_line::arg_descriptor arg_pack_file = {"pack-file", "perform gzip-packing and calculate hash for a given file", "", true }; - const command_line::arg_descriptor arg_unpack_file = {"unpack-file", "Perform gzip-unpacking and calculate hash for a given file", "", true }; - const command_line::arg_descriptor arg_target_file = {"target-file", "Specify target file for pack-file and unpack-file commands", "", true }; - //const command_line::arg_descriptor arg_send_ipc = {"send-ipc", "Send IPC request to UI", "", true }; + const command_line::arg_descriptor arg_ip ("ip", "set ip", "127.0.0.1"); + const command_line::arg_descriptor arg_port ("port", "set port"); + const command_line::arg_descriptor arg_rpc_port ("rpc-port", "set rpc port", RPC_DEFAULT_PORT); + const command_line::arg_descriptor arg_timeout ("timeout", "set timeout", 5000); + const command_line::arg_descriptor arg_priv_key ("private-key", "private key to subscribe debug command"); + const command_line::arg_descriptor arg_peer_id ("peer-id", "peerid if known(if not - will be requested)", 0); + const command_line::arg_descriptor arg_generate_keys ("generate-keys-pair", "generate private and public keys pair"); + const command_line::arg_descriptor arg_request_stat_info ("request-stat-info", "request statistics information"); + const command_line::arg_descriptor arg_log_journal_len ( "log-journal-len", "Specify length of list of last error messages in log"); + const command_line::arg_descriptor arg_request_net_state ("request-net-state", "request network state information (peer list, connections count)"); + const command_line::arg_descriptor arg_get_daemon_info ("rpc-get-daemon-info", "request daemon state info vie rpc (--rpc-port option should be set )."); + const command_line::arg_descriptor arg_get_aliases ("rpc-get-aliases", "request daemon aliases all list"); + const command_line::arg_descriptor arg_increment_build_no ( "increment-build-no", "Increment build nimber"); + const command_line::arg_descriptor arg_upate_maintainers_info ("update-maintainers-info", "Push maintainers info into the network, update-maintainers-info=file-with-info.json"); + const command_line::arg_descriptor arg_update_build_no ("update-build-no", "Updated version number in version template file"); + const command_line::arg_descriptor arg_generate_genesis ("generate-genesis", "Generate genesis coinbase based on config file"); + const command_line::arg_descriptor arg_genesis_split_amount ( "genesis-split-amount", "Set split amount for generating genesis block"); + const command_line::arg_descriptor arg_get_info_flags ( "getinfo-flags-hex", "Set of bits for rpc-get-daemon-info", ""); + const command_line::arg_descriptor arg_set_peer_log_level ( "set-peer-log-level", "Set log level for remote peer"); + const command_line::arg_descriptor arg_download_peer_log ( "download-peer-log", "Download log from remote peer [,]"); + const command_line::arg_descriptor arg_do_consloe_log ( "do-console-log", "Tool generates debug console output(debug purposes)"); + const command_line::arg_descriptor arg_generate_integrated_address ( "generate-integrated-address", "Tool create integrated address from simple address and payment_id"); + const command_line::arg_descriptor arg_pack_file ("pack-file", "perform gzip-packing and calculate hash for a given file"); + const command_line::arg_descriptor arg_unpack_file ("unpack-file", "Perform gzip-unpacking and calculate hash for a given file"); + const command_line::arg_descriptor arg_target_file ("target-file", "Specify target file for pack-file and unpack-file commands"); + //const command_line::arg_descriptor arg_send_ipc ("send-ipc", "Send IPC request to UI"); } typedef COMMAND_REQUEST_STAT_INFO_T::stat_info> COMMAND_REQUEST_STAT_INFO; diff --git a/src/currency_core/bc_offers_service.cpp b/src/currency_core/bc_offers_service.cpp index 59064632..b6349e90 100644 --- a/src/currency_core/bc_offers_service.cpp +++ b/src/currency_core/bc_offers_service.cpp @@ -13,7 +13,7 @@ #include "storages/portable_storage_template_helper.h" -command_line::arg_descriptor arg_market_disable = { "disable-market", "Start GUI with market service disabled", false, true }; +command_line::arg_descriptor arg_market_disable ( "disable-market", "Start GUI with market service disabled"); namespace bc_services diff --git a/src/currency_core/blockchain_storage.cpp b/src/currency_core/blockchain_storage.cpp index 6bb47719..9ab636f5 100644 --- a/src/currency_core/blockchain_storage.cpp +++ b/src/currency_core/blockchain_storage.cpp @@ -80,8 +80,8 @@ DISABLE_VS_WARNINGS(4267) namespace { - const command_line::arg_descriptor arg_db_cache_l1 = { "db-cache-l1", "Specify size of memory mapped db cache file", 0, true }; - const command_line::arg_descriptor arg_db_cache_l2 = { "db-cache-l2", "Specify cached elements in db helpers", 0, true }; + const command_line::arg_descriptor arg_db_cache_l1 ( "db-cache-l1", "Specify size of memory mapped db cache file"); + const command_line::arg_descriptor arg_db_cache_l2 ( "db-cache-l2", "Specify cached elements in db helpers"); } //------------------------------------------------------------------ diff --git a/src/currency_core/miner.cpp b/src/currency_core/miner.cpp index 005c274c..d52e51e2 100644 --- a/src/currency_core/miner.cpp +++ b/src/currency_core/miner.cpp @@ -33,10 +33,10 @@ namespace currency namespace { - const command_line::arg_descriptor arg_extra_messages = {"extra-messages-file", "Specify file for extra messages to include into coinbase transactions", "", true}; - const command_line::arg_descriptor arg_start_mining = {"start-mining", "Specify wallet address to mining for", "", true}; - const command_line::arg_descriptor arg_mining_threads = {"mining-threads", "Specify mining threads count", 0, true}; - const command_line::arg_descriptor arg_block_template_extra_text = { "miner-text-info", "Set block extra text info", "", true }; + const command_line::arg_descriptor arg_extra_messages ("extra-messages-file", "Specify file for extra messages to include into coinbase transactions"); + const command_line::arg_descriptor arg_start_mining ("start-mining", "Specify wallet address to mining for"); + const command_line::arg_descriptor arg_mining_threads ("mining-threads", "Specify mining threads count"); + const command_line::arg_descriptor arg_block_template_extra_text ( "miner-text-info", "Set block extra text info"); } diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 477d7e8b..a63e88ed 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -26,18 +26,18 @@ namespace nodetool namespace { - const command_line::arg_descriptor arg_p2p_bind_ip = {"p2p-bind-ip", "Interface for p2p network protocol", "0.0.0.0"}; - const command_line::arg_descriptor arg_p2p_bind_port = {"p2p-bind-port", "Port for p2p network protocol", boost::to_string(P2P_DEFAULT_PORT)}; - const command_line::arg_descriptor arg_p2p_external_port = {"p2p-external-port", "External port for p2p network protocol (if port forwarding used with NAT)", 0}; - const command_line::arg_descriptor arg_p2p_allow_local_ip = {"allow-local-ip", "Allow local ip add to peer list, mostly in debug purposes"}; - const command_line::arg_descriptor > arg_p2p_add_peer = {"add-peer", "Manually add peer to local peerlist"}; - const command_line::arg_descriptor > arg_p2p_add_priority_node = {"add-priority-node", "Specify list of peers to connect to and attempt to keep the connection open"}; - const command_line::arg_descriptor arg_p2p_use_only_priority_nodes = {"use-only-priority-nodes", "Try to connect only to priority nodes"}; - const command_line::arg_descriptor > arg_p2p_seed_node = {"seed-node", "Connect to a node to retrieve peer addresses, and disconnect"}; - const command_line::arg_descriptor arg_p2p_hide_my_port = {"hide-my-port", "Do not announce yourself as peerlist candidate", false, true}; - const command_line::arg_descriptor arg_p2p_offline_mode = { "offline-mode", "Don't connect to any node and reject any connections", false, true }; - const command_line::arg_descriptor arg_p2p_disable_debug_reqs = { "disable-debug-p2p-requests", "Disable p2p debug requests", false, true }; - const command_line::arg_descriptor arg_p2p_ip_auto_blocking = { "p2p-ip-auto-blocking", "Enable (1) or disable (0) peers auto-blocking by IP <0|1>. Default: 0", 0, false }; + const command_line::arg_descriptor arg_p2p_bind_ip ("p2p-bind-ip", "Interface for p2p network protocol", "0.0.0.0"); + const command_line::arg_descriptor arg_p2p_bind_port ("p2p-bind-port", "Port for p2p network protocol", boost::to_string(P2P_DEFAULT_PORT)); + const command_line::arg_descriptor arg_p2p_external_port ("p2p-external-port", "External port for p2p network protocol (if port forwarding used with NAT)", 0); + const command_line::arg_descriptor arg_p2p_allow_local_ip ("allow-local-ip", "Allow local ip add to peer list, mostly in debug purposes"); + const command_line::arg_descriptor > arg_p2p_add_peer ("add-peer", "Manually add peer to local peerlist"); + const command_line::arg_descriptor > arg_p2p_add_priority_node ("add-priority-node", "Specify list of peers to connect to and attempt to keep the connection open"); + const command_line::arg_descriptor arg_p2p_use_only_priority_nodes ("use-only-priority-nodes", "Try to connect only to priority nodes"); + const command_line::arg_descriptor > arg_p2p_seed_node ("seed-node", "Connect to a node to retrieve peer addresses, and disconnect"); + const command_line::arg_descriptor arg_p2p_hide_my_port ("hide-my-port", "Do not announce yourself as peerlist candidate"); + const command_line::arg_descriptor arg_p2p_offline_mode ( "offline-mode", "Don't connect to any node and reject any connections"); + const command_line::arg_descriptor arg_p2p_disable_debug_reqs ( "disable-debug-p2p-requests", "Disable p2p debug requests"); + const command_line::arg_descriptor arg_p2p_ip_auto_blocking ( "p2p-ip-auto-blocking", "Enable (1) or disable (0) peers auto-blocking by IP <0|1>. Default: 0", 1); } //----------------------------------------------------------------------------------- diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 0f4d866c..5adc60f9 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -22,9 +22,9 @@ namespace currency { namespace { - const command_line::arg_descriptor arg_rpc_bind_ip = {"rpc-bind-ip", "", "127.0.0.1"}; - const command_line::arg_descriptor arg_rpc_bind_port = {"rpc-bind-port", "", std::to_string(RPC_DEFAULT_PORT)}; - const command_line::arg_descriptor arg_rpc_ignore_status = {"rpc-ignore-offline", "Let rpc calls despite online/offline status", false, true }; + const command_line::arg_descriptor arg_rpc_bind_ip ("rpc-bind-ip", "", "127.0.0.1"); + const command_line::arg_descriptor arg_rpc_bind_port ("rpc-bind-port", "", std::to_string(RPC_DEFAULT_PORT)); + const command_line::arg_descriptor arg_rpc_ignore_status ("rpc-ignore-offline", "Let rpc calls despite online/offline status"); } //----------------------------------------------------------------------------------- void core_rpc_server::init_options(boost::program_options::options_description& desc) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index e2f2f88b..1cc8d064 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -40,25 +40,25 @@ namespace ph = boost::placeholders; namespace { - const command_line::arg_descriptor arg_wallet_file = {"wallet-file", "Use wallet ", ""}; - const command_line::arg_descriptor arg_generate_new_wallet = {"generate-new-wallet", "Generate new wallet and save it to or
.wallet by default", ""}; - const command_line::arg_descriptor arg_generate_new_auditable_wallet = {"generate-new-auditable-wallet", "Generate new auditable wallet and store it to ", ""}; - const command_line::arg_descriptor arg_daemon_address = {"daemon-address", "Use daemon instance at :", ""}; - const command_line::arg_descriptor arg_daemon_host = {"daemon-host", "Use daemon instance at host instead of localhost", ""}; - const command_line::arg_descriptor arg_password = {"password", "Wallet password", "", true}; - const command_line::arg_descriptor arg_dont_refresh = { "no-refresh", "Do not refresh after load", false, true }; - const command_line::arg_descriptor arg_dont_set_date = { "no-set-creation-date", "Do not set wallet creation date", false, false }; - const command_line::arg_descriptor arg_daemon_port = {"daemon-port", "Use daemon instance at port instead of default", 0}; - const command_line::arg_descriptor arg_log_level = {"set-log", "", 0, true}; - const command_line::arg_descriptor arg_do_pos_mining = { "do-pos-mining", "Do PoS mining", false, false }; - const command_line::arg_descriptor arg_pos_mining_reward_address = { "pos-mining-reward-address", "Block reward will be sent to the giving address if specified", "" }; - const command_line::arg_descriptor arg_restore_wallet = { "restore-wallet", "Restore wallet from seed phrase or tracking seed and save it to ", "" }; - const command_line::arg_descriptor arg_offline_mode = { "offline-mode", "Don't connect to daemon, work offline (for cold-signing process)", false, true }; - const command_line::arg_descriptor arg_scan_for_wallet = { "scan-for-wallet", "", "", true }; - const command_line::arg_descriptor arg_addr_to_compare = { "addr-to-compare", "", "", true }; - const command_line::arg_descriptor arg_disable_tor_relay = { "disable-tor-relay", "Do PoS mining", false, false }; + const command_line::arg_descriptor arg_wallet_file ("wallet-file", "Use wallet ", ""); + const command_line::arg_descriptor arg_generate_new_wallet ("generate-new-wallet", "Generate new wallet and save it to or
.wallet by default", ""); + const command_line::arg_descriptor arg_generate_new_auditable_wallet ("generate-new-auditable-wallet", "Generate new auditable wallet and store it to ", ""); + const command_line::arg_descriptor arg_daemon_address ("daemon-address", "Use daemon instance at :", ""); + const command_line::arg_descriptor arg_daemon_host ("daemon-host", "Use daemon instance at host instead of localhost", ""); + const command_line::arg_descriptor arg_password ("password", "Wallet password"); + const command_line::arg_descriptor arg_dont_refresh ( "no-refresh", "Do not refresh after load"); + const command_line::arg_descriptor arg_dont_set_date ( "no-set-creation-date", "Do not set wallet creation date", false); + const command_line::arg_descriptor arg_daemon_port ("daemon-port", "Use daemon instance at port instead of default", 0); + const command_line::arg_descriptor arg_log_level ("set-log", ""); + const command_line::arg_descriptor arg_do_pos_mining ( "do-pos-mining", "Do PoS mining", false); + const command_line::arg_descriptor arg_pos_mining_reward_address ( "pos-mining-reward-address", "Block reward will be sent to the giving address if specified", "" ); + const command_line::arg_descriptor arg_restore_wallet ( "restore-wallet", "Restore wallet from seed phrase or tracking seed and save it to ", "" ); + const command_line::arg_descriptor arg_offline_mode ( "offline-mode", "Don't connect to daemon, work offline (for cold-signing process)"); + const command_line::arg_descriptor arg_scan_for_wallet ( "scan-for-wallet", ""); + const command_line::arg_descriptor arg_addr_to_compare ( "addr-to-compare", ""); + const command_line::arg_descriptor arg_disable_tor_relay ( "disable-tor-relay", "Do PoS mining", false); - const command_line::arg_descriptor< std::vector > arg_command = {"command", ""}; + const command_line::arg_descriptor< std::vector > arg_command ("command", ""); inline std::string interpret_rpc_response(bool ok, const std::string& status) { diff --git a/src/stratum/stratum_server.cpp b/src/stratum/stratum_server.cpp index 5e239baa..f952cd7a 100644 --- a/src/stratum/stratum_server.cpp +++ b/src/stratum/stratum_server.cpp @@ -39,25 +39,25 @@ namespace #define VDIFF_RETARGET_SHARES_COUNT 12 // enforce retargeting if this many shares are received (high performace in terms of current difficulty) #define VDIFF_VARIANCE_PERCENT_DEFAULT 25 // % - const command_line::arg_descriptor arg_stratum = {"stratum", "Stratum server: enable" }; - const command_line::arg_descriptor arg_stratum_bind_ip = {"stratum-bind-ip", "Stratum server: IP to bind", STRATUM_BIND_IP_DEFAULT }; - const command_line::arg_descriptor arg_stratum_bind_port = {"stratum-bind-port", "Stratum server: port to listen at", std::to_string(STRATUM_DEFAULT_PORT) }; - const command_line::arg_descriptor arg_stratum_threads = {"stratum-threads-count", "Stratum server: number of server threads", STRATUM_THREADS_COUNT_DEFAULT }; + const command_line::arg_descriptor arg_stratum ("stratum", "Stratum server: enable" ); + const command_line::arg_descriptor arg_stratum_bind_ip ("stratum-bind-ip", "Stratum server: IP to bind", STRATUM_BIND_IP_DEFAULT ); + const command_line::arg_descriptor arg_stratum_bind_port ("stratum-bind-port", "Stratum server: port to listen at", std::to_string(STRATUM_DEFAULT_PORT) ); + const command_line::arg_descriptor arg_stratum_threads ("stratum-threads-count", "Stratum server: number of server threads", STRATUM_THREADS_COUNT_DEFAULT ); const command_line::arg_descriptor arg_stratum_miner_address = {"stratum-miner-address", "Stratum server: miner address. All workers" " will mine to this address. If not set here, ALL workers should use the very same wallet address as username." - " If set here - they're allowed to log in with username '" WORKER_ALLOWED_USERNAME "' instead of address.", "", true }; + " If set here - they're allowed to log in with username '" WORKER_ALLOWED_USERNAME "' instead of address."}; const command_line::arg_descriptor arg_stratum_block_template_update_period = {"stratum-template-update-period", "Stratum server: if there are no new blocks, update block template this often (sec.)", STRATUM_BLOCK_TEMPLATE_UPD_PERIOD_DEFAULT }; - const command_line::arg_descriptor arg_stratum_hr_print_interval = {"stratum-hr-print-interval", "Stratum server: how often to print hashrate stats (sec.)", STRATUM_TOTAL_HR_PRINT_INTERVAL_S_DEFAULT }; + const command_line::arg_descriptor arg_stratum_hr_print_interval ("stratum-hr-print-interval", "Stratum server: how often to print hashrate stats (sec.)", STRATUM_TOTAL_HR_PRINT_INTERVAL_S_DEFAULT ); - const command_line::arg_descriptor arg_stratum_vdiff_target_min = {"stratum-vdiff-target-min", "Stratum server: minimum worker difficulty", VDIFF_TARGET_MIN_DEFAULT }; - const command_line::arg_descriptor arg_stratum_vdiff_target_max = {"stratum-vdiff-target-max", "Stratum server: maximum worker difficulty", VDIFF_TARGET_MAX_DEFAULT }; - const command_line::arg_descriptor arg_stratum_vdiff_target_time = {"stratum-vdiff-target-time", "Stratum server: target time per share (i.e. try to get one share per this many seconds)", VDIFF_TARGET_TIME_DEFAULT }; - const command_line::arg_descriptor arg_stratum_vdiff_retarget_time = {"stratum-vdiff-retarget-time", "Stratum server: check to see if we should retarget this often (sec.)", VDIFF_RETARGET_TIME_DEFAULT }; - const command_line::arg_descriptor arg_stratum_vdiff_retarget_shares = {"stratum-vdiff-retarget-shares", "Stratum server: enforce retargeting if got this many shares", VDIFF_RETARGET_SHARES_COUNT }; - const command_line::arg_descriptor arg_stratum_vdiff_variance_percent = {"stratum-vdiff-variance-percent", "Stratum server: allow average time to very this % from target without retarget", VDIFF_VARIANCE_PERCENT_DEFAULT }; - const command_line::arg_descriptor arg_stratum_always_online = { "stratum-always-online", "Stratum server consider the core being synchronized regardless of online status, useful for debugging with --offline-mode" }; + const command_line::arg_descriptor arg_stratum_vdiff_target_min ("stratum-vdiff-target-min", "Stratum server: minimum worker difficulty", VDIFF_TARGET_MIN_DEFAULT ); + const command_line::arg_descriptor arg_stratum_vdiff_target_max ("stratum-vdiff-target-max", "Stratum server: maximum worker difficulty", VDIFF_TARGET_MAX_DEFAULT ); + const command_line::arg_descriptor arg_stratum_vdiff_target_time ("stratum-vdiff-target-time", "Stratum server: target time per share (i.e. try to get one share per this many seconds)", VDIFF_TARGET_TIME_DEFAULT ); + const command_line::arg_descriptor arg_stratum_vdiff_retarget_time ("stratum-vdiff-retarget-time", "Stratum server: check to see if we should retarget this often (sec.)", VDIFF_RETARGET_TIME_DEFAULT ); + const command_line::arg_descriptor arg_stratum_vdiff_retarget_shares ("stratum-vdiff-retarget-shares", "Stratum server: enforce retargeting if got this many shares", VDIFF_RETARGET_SHARES_COUNT ); + const command_line::arg_descriptor arg_stratum_vdiff_variance_percent ("stratum-vdiff-variance-percent", "Stratum server: allow average time to very this % from target without retarget", VDIFF_VARIANCE_PERCENT_DEFAULT ); + const command_line::arg_descriptor arg_stratum_always_online ( "stratum-always-online", "Stratum server consider the core being synchronized regardless of online status, useful for debugging with --offline-mode" ); //============================================================================================================================== diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index ca888e83..43d9625b 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -43,10 +43,10 @@ using namespace epee; namespace tools { //----------------------------------------------------------------------------------- - const command_line::arg_descriptor wallet_rpc_server::arg_rpc_bind_port = {"rpc-bind-port", "Starts wallet as rpc server for wallet operations, sets bind port for server", "", true}; - const command_line::arg_descriptor wallet_rpc_server::arg_rpc_bind_ip = {"rpc-bind-ip", "Specify ip to bind rpc server", "127.0.0.1"}; - const command_line::arg_descriptor wallet_rpc_server::arg_miner_text_info = { "miner-text-info", "Wallet password", "", true }; - const command_line::arg_descriptor wallet_rpc_server::arg_deaf_mode = { "deaf", "Put wallet into 'deaf' mode make it ignore any rpc commands(usable for safe PoS mining)", false, true }; + const command_line::arg_descriptor wallet_rpc_server::arg_rpc_bind_port ("rpc-bind-port", "Starts wallet as rpc server for wallet operations, sets bind port for server"); + const command_line::arg_descriptor wallet_rpc_server::arg_rpc_bind_ip ("rpc-bind-ip", "Specify ip to bind rpc server", "127.0.0.1"); + const command_line::arg_descriptor wallet_rpc_server::arg_miner_text_info ( "miner-text-info", "Wallet password"); + const command_line::arg_descriptor wallet_rpc_server::arg_deaf_mode ( "deaf", "Put wallet into 'deaf' mode make it ignore any rpc commands(usable for safe PoS mining)"); void wallet_rpc_server::init_options(boost::program_options::options_description& desc) { diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp index 54f0f2f3..298b338e 100644 --- a/src/wallet/wallets_manager.cpp +++ b/src/wallet/wallets_manager.cpp @@ -51,15 +51,15 @@ #define HTTP_PROXY_TIMEOUT 2000 #define HTTP_PROXY_ATTEMPTS_COUNT 1 -const command_line::arg_descriptor arg_alloc_win_console = { "alloc-win-console", "Allocates debug console with GUI", false }; -const command_line::arg_descriptor arg_html_folder = { "html-path", "Manually set GUI html folder path", "", true }; -const command_line::arg_descriptor arg_xcode_stub = { "-NSDocumentRevisionsDebugMode", "Substitute for xcode bug", "", true }; -const command_line::arg_descriptor arg_enable_gui_debug_mode = { "gui-debug-mode", "Enable debug options in GUI", false, true }; -const command_line::arg_descriptor arg_qt_remote_debugging_port = { "remote-debugging-port", "Specify port for Qt remote debugging", 30333, true }; -const command_line::arg_descriptor arg_remote_node = { "remote-node", "Switch GUI to work with remote node instead of local daemon", "", true }; -const command_line::arg_descriptor arg_enable_qt_logs = { "enable-qt-logs", "Forward Qt log messages into main log", false, true }; +const command_line::arg_descriptor arg_alloc_win_console ( "alloc-win-console", "Allocates debug console with GUI", false ); +const command_line::arg_descriptor arg_html_folder ( "html-path", "Manually set GUI html folder path"); +const command_line::arg_descriptor arg_xcode_stub ( "-NSDocumentRevisionsDebugMode", "Substitute for xcode bug"); +const command_line::arg_descriptor arg_enable_gui_debug_mode ( "gui-debug-mode", "Enable debug options in GUI"); +const command_line::arg_descriptor arg_qt_remote_debugging_port ( "remote-debugging-port", "Specify port for Qt remote debugging"); +const command_line::arg_descriptor arg_remote_node ( "remote-node", "Switch GUI to work with remote node instead of local daemon"); +const command_line::arg_descriptor arg_enable_qt_logs ( "enable-qt-logs", "Forward Qt log messages into main log"); const command_line::arg_descriptor arg_disable_logs_init("disable-logs-init", "Disable log initialization in GUI"); -const command_line::arg_descriptor arg_qt_dev_tools = { "qt-dev-tools", "Enable main web page inspection with Chromium DevTools, [,scale], e.g. \"horizontal,1.3\"", "", false }; +const command_line::arg_descriptor arg_qt_dev_tools ( "qt-dev-tools", "Enable main web page inspection with Chromium DevTools, [,scale], e.g. \"horizontal,1.3\"", ""); wallets_manager::wallets_manager():m_pview(&m_view_stub), m_stop_singal_sent(false), diff --git a/tests/core_tests/chaingen_main.cpp b/tests/core_tests/chaingen_main.cpp index 0765a006..f19180f1 100644 --- a/tests/core_tests/chaingen_main.cpp +++ b/tests/core_tests/chaingen_main.cpp @@ -21,13 +21,13 @@ namespace po = boost::program_options; namespace { - const command_line::arg_descriptor arg_test_data_path = {"test-data-path", "", ""}; - const command_line::arg_descriptor arg_generate_test_data = {"generate-test-data", ""}; - const command_line::arg_descriptor arg_play_test_data = {"play-test-data", ""}; - const command_line::arg_descriptor arg_generate_and_play_test_data = {"generate-and-play-test-data", ""}; - const command_line::arg_descriptor arg_test_transactions = {"test-transactions", ""}; - const command_line::arg_descriptor arg_run_single_test = {"run-single-test", "" }; - const command_line::arg_descriptor arg_enable_debug_asserts = {"enable-debug-asserts", "" }; + const command_line::arg_descriptor arg_test_data_path ("test-data-path", "", ""); + const command_line::arg_descriptor arg_generate_test_data ("generate-test-data", ""); + const command_line::arg_descriptor arg_play_test_data ("play-test-data", ""); + const command_line::arg_descriptor arg_generate_and_play_test_data ("generate-and-play-test-data", ""); + const command_line::arg_descriptor arg_test_transactions ("test-transactions", ""); + const command_line::arg_descriptor arg_run_single_test ("run-single-test", "" ); + const command_line::arg_descriptor arg_enable_debug_asserts ("enable-debug-asserts", "" ); boost::program_options::variables_map g_vm; } diff --git a/tests/functional_tests/main.cpp b/tests/functional_tests/main.cpp index fc3da2d0..b275bd4a 100644 --- a/tests/functional_tests/main.cpp +++ b/tests/functional_tests/main.cpp @@ -23,40 +23,40 @@ using namespace epee; namespace po = boost::program_options; -const command_line::arg_descriptor arg_test_core_prepare_and_store = { "prepare-and-store-events-to-file", "", "", true }; -const command_line::arg_descriptor arg_test_core_load_and_replay = { "load-and-replay-events-from-file", "", "", true }; +const command_line::arg_descriptor arg_test_core_prepare_and_store ( "prepare-and-store-events-to-file", ""); +const command_line::arg_descriptor arg_test_core_load_and_replay ( "load-and-replay-events-from-file", ""); namespace { - const command_line::arg_descriptor arg_test_transactions_flow = {"test-transactions-flow", ""}; - const command_line::arg_descriptor arg_test_miniupnp = {"test-miniupnp", ""}; - const command_line::arg_descriptor arg_test_core_concurrency = {"test-core-concurrency", ""}; + const command_line::arg_descriptor arg_test_transactions_flow ("test-transactions-flow", ""); + const command_line::arg_descriptor arg_test_miniupnp ("test-miniupnp", ""); + const command_line::arg_descriptor arg_test_core_concurrency ("test-core-concurrency", ""); - const command_line::arg_descriptor arg_working_folder = {"working-folder", "", "."}; - const command_line::arg_descriptor arg_source_wallet = {"source-wallet", "", "", true}; - const command_line::arg_descriptor arg_dest_wallet = {"dest-wallet", "", "", true}; - const command_line::arg_descriptor arg_source_wallet_pass = {"source-wallet-pass", "", "", true}; - const command_line::arg_descriptor arg_dest_wallet_pass = {"dest-wallet-pass", "", "", true}; + const command_line::arg_descriptor arg_working_folder ("working-folder", "", "."); + const command_line::arg_descriptor arg_source_wallet ("source-wallet", ""); + const command_line::arg_descriptor arg_dest_wallet ("dest-wallet", ""); + const command_line::arg_descriptor arg_source_wallet_pass ("source-wallet-pass", ""); + const command_line::arg_descriptor arg_dest_wallet_pass ("dest-wallet-pass", ""); - const command_line::arg_descriptor arg_daemon_addr_a = {"daemon-addr-a", "", "127.0.0.1:8080"}; - const command_line::arg_descriptor arg_daemon_addr_b = {"daemon-addr-b", "", "127.0.0.1:8082"}; + const command_line::arg_descriptor arg_daemon_addr_a ("daemon-addr-a", "", "127.0.0.1:8080"); + const command_line::arg_descriptor arg_daemon_addr_b ("daemon-addr-b", "", "127.0.0.1:8082"); - const command_line::arg_descriptor arg_transfer_amount = {"transfer-amount", "", 60000000000000}; - const command_line::arg_descriptor arg_mix_in_factor = {"mix-in-factor", "", 10}; - const command_line::arg_descriptor arg_tx_count = {"tx-count", "", 100}; - const command_line::arg_descriptor arg_tx_per_second = {"tx-per-second", "", 20}; - const command_line::arg_descriptor arg_test_repeat_count = {"test-repeat-count", "", 1}; - const command_line::arg_descriptor arg_action = {"action", "", 0 }; - const command_line::arg_descriptor arg_max_tx_in_pool = { "max-tx-in-pool", "", 10000 }; - const command_line::arg_descriptor arg_data_dir = {"data-dir", "Specify data directory", "."}; - const command_line::arg_descriptor arg_wthreads = {"wthreads", "number of writing threads to run", 1}; - const command_line::arg_descriptor arg_rthreads = {"rthreads", "number of reading threads to run", 1}; - const command_line::arg_descriptor arg_blocks = {"blocks", "number of blocks to generate", 250}; - const command_line::arg_descriptor arg_generate_test_genesis_json = { "generate-test-genesis-json", "generates test genesis json, specify amount of accounts", 0, true }; - const command_line::arg_descriptor arg_deadlock_guard = { "test-deadlock-guard", "Do deadlock guard test", false, true }; - const command_line::arg_descriptor arg_difficulty_analysis = { "difficulty-analysis", "Do difficulty analysis", "", true }; - const command_line::arg_descriptor arg_test_plain_wallet = { "test-plainwallet", "Do testing of plain wallet interface", false, true }; - const command_line::arg_descriptor arg_crypto_tests = { "crypto-tests", "Run experimental crypto tests", "", true }; + const command_line::arg_descriptor arg_transfer_amount ("transfer-amount", "", 60000000000000); + const command_line::arg_descriptor arg_mix_in_factor ("mix-in-factor", "", 10); + const command_line::arg_descriptor arg_tx_count ("tx-count", "", 100); + const command_line::arg_descriptor arg_tx_per_second ("tx-per-second", "", 20); + const command_line::arg_descriptor arg_test_repeat_count ("test-repeat-count", "", 1); + const command_line::arg_descriptor arg_action ("action", "", 0 ); + const command_line::arg_descriptor arg_max_tx_in_pool ( "max-tx-in-pool", "", 10000 ); + const command_line::arg_descriptor arg_data_dir ("data-dir", "Specify data directory", "."); + const command_line::arg_descriptor arg_wthreads ("wthreads", "number of writing threads to run", 1); + const command_line::arg_descriptor arg_rthreads ("rthreads", "number of reading threads to run", 1); + const command_line::arg_descriptor arg_blocks ("blocks", "number of blocks to generate", 250); + const command_line::arg_descriptor arg_generate_test_genesis_json ( "generate-test-genesis-json", "generates test genesis json, specify amount of accounts"); + const command_line::arg_descriptor arg_deadlock_guard ( "test-deadlock-guard", "Do deadlock guard test"); + const command_line::arg_descriptor arg_difficulty_analysis ( "difficulty-analysis", "Do difficulty analysis"); + const command_line::arg_descriptor arg_test_plain_wallet ( "test-plainwallet", "Do testing of plain wallet interface"); + const command_line::arg_descriptor arg_crypto_tests ( "crypto-tests", "Run experimental crypto tests"); }