diff options
| author | whythat <whythat@protonmail.com> | 2018-01-21 17:29:55 +0200 |
|---|---|---|
| committer | whythat <whythat@protonmail.com> | 2018-02-16 22:32:01 +0200 |
| commit | 05a12ccc2dc920f4a997e66e6965ae60c1a4c65e (patch) | |
| tree | a694dfd20154294b7a12b9c0b99863c2049b86b6 /src/rpc | |
| parent | common: implement dependent option descriptor (diff) | |
| download | monero-05a12ccc2dc920f4a997e66e6965ae60c1a4c65e.tar.xz | |
options: remove testnet-* options
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 18 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server.h | 4 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index da2e79dfa..4eab9b6d9 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -73,8 +73,6 @@ namespace cryptonote { command_line::add_arg(desc, arg_rpc_bind_port); command_line::add_arg(desc, arg_rpc_restricted_bind_port); - command_line::add_arg(desc, arg_testnet_rpc_bind_port); - command_line::add_arg(desc, arg_testnet_rpc_restricted_bind_port); command_line::add_arg(desc, arg_restricted_rpc); command_line::add_arg(desc, arg_bootstrap_daemon_address); command_line::add_arg(desc, arg_bootstrap_daemon_login); @@ -2075,9 +2073,11 @@ namespace cryptonote } //------------------------------------------------------------------------------------------------------------------------------ - const command_line::arg_descriptor<std::string> core_rpc_server::arg_rpc_bind_port = { + const command_line::arg_descriptor<std::string, false, true> core_rpc_server::arg_rpc_bind_port = { "rpc-bind-port" , "Port for RPC server" + , cryptonote::arg_testnet_on + , std::to_string(config::testnet::RPC_DEFAULT_PORT) , std::to_string(config::RPC_DEFAULT_PORT) }; @@ -2087,18 +2087,6 @@ namespace cryptonote , "" }; - const command_line::arg_descriptor<std::string> core_rpc_server::arg_testnet_rpc_bind_port = { - "testnet-rpc-bind-port" - , "Port for testnet RPC server" - , std::to_string(config::testnet::RPC_DEFAULT_PORT) - }; - - const command_line::arg_descriptor<std::string> core_rpc_server::arg_testnet_rpc_restricted_bind_port = { - "testnet-rpc-restricted-bind-port" - , "Port for testnet restricted RPC server" - , "" - }; - const command_line::arg_descriptor<bool> core_rpc_server::arg_restricted_rpc = { "restricted-rpc" , "Restrict RPC to view only commands and do not return privacy sensitive data in RPC calls" diff --git a/src/rpc/core_rpc_server.h b/src/rpc/core_rpc_server.h index 650e738bd..3c57a6016 100644 --- a/src/rpc/core_rpc_server.h +++ b/src/rpc/core_rpc_server.h @@ -53,10 +53,8 @@ namespace cryptonote { public: - static const command_line::arg_descriptor<std::string> arg_rpc_bind_port; + static const command_line::arg_descriptor<std::string, false, true> arg_rpc_bind_port; static const command_line::arg_descriptor<std::string> arg_rpc_restricted_bind_port; - static const command_line::arg_descriptor<std::string> arg_testnet_rpc_bind_port; - static const command_line::arg_descriptor<std::string> arg_testnet_rpc_restricted_bind_port; static const command_line::arg_descriptor<bool> arg_restricted_rpc; static const command_line::arg_descriptor<std::string> arg_bootstrap_daemon_address; static const command_line::arg_descriptor<std::string> arg_bootstrap_daemon_login; |