Merge pull request #3170

b3b2d4d2 options: add testnet option dependencies (whythat)
c5f55bb4 common: implement dynamic option dependencies mechanism (whythat)
05a12ccc options: remove testnet-* options (whythat)
c33cb60e common: implement dependent option descriptor (whythat)

1 files changed, 7 insertions, 6 deletions

diff --git a/src/p2p/net_node.cpp b/src/p2p/net_node.cpp
index 994941168..170b79984 100644
--- a/src/p2p/net_node.cpp
+++ b/src/p2p/net_node.cpp
@@ -34,15 +34,16 @@
 namespace nodetool
 {
     const command_line::arg_descriptor<std::string> arg_p2p_bind_ip        = {"p2p-bind-ip", "Interface for p2p network protocol", "0.0.0.0"};
-    const command_line::arg_descriptor<std::string> arg_p2p_bind_port = {
+    const command_line::arg_descriptor<std::string, false, true> arg_p2p_bind_port = {
         "p2p-bind-port"
       , "Port for p2p network protocol"
       , std::to_string(config::P2P_DEFAULT_PORT)
-      };
-    const command_line::arg_descriptor<std::string> arg_testnet_p2p_bind_port = {
-        "testnet-p2p-bind-port"
-      , "Port for testnet p2p network protocol"
-      , std::to_string(config::testnet::P2P_DEFAULT_PORT)
+      , cryptonote::arg_testnet_on
+      , [](bool testnet, bool defaulted, std::string val) {
+          if (testnet && defaulted)
+            return std::to_string(config::testnet::P2P_DEFAULT_PORT);
+          return val;
+        }
       };
     const command_line::arg_descriptor<uint32_t>    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<bool>        arg_p2p_allow_local_ip = {"allow-local-ip", "Allow local ip add to peer list, mostly in debug purposes"};