Separate testnet default data dir

src/common/command_line.cpp

@@ -47,4 +47,5 @@ namespace command_line
   const arg_descriptor<bool> arg_help = {"help", "Produce help message"};
   const arg_descriptor<bool> arg_version = {"version", "Output version information"};
   const arg_descriptor<std::string> arg_data_dir = {"data-dir", "Specify data directory"};
+  const arg_descriptor<std::string> arg_testnet_data_dir = {"testnet-data-dir", "Specify testnet data directory"};
 }

src/common/command_line.h

@@ -203,4 +203,5 @@ namespace command_line
   extern const arg_descriptor<bool> arg_help;
   extern const arg_descriptor<bool> arg_version;
   extern const arg_descriptor<std::string> arg_data_dir;
+  extern const arg_descriptor<std::string> arg_testnet_data_dir;
 }

src/cryptonote_core/cryptonote_core.cpp

@@ -75,9 +75,10 @@ namespace cryptonote
   {
   }
   //-----------------------------------------------------------------------------------------------
-  bool core::handle_command_line(const boost::program_options::variables_map& vm)
+  bool core::handle_command_line(const boost::program_options::variables_map& vm, bool testnet)
   {
-    m_config_folder = command_line::get_arg(vm, command_line::arg_data_dir);
+    auto data_dir_arg = testnet ? command_line::arg_testnet_data_dir : command_line::arg_data_dir;
+    m_config_folder = command_line::get_arg(vm, data_dir_arg);
     return true;
   }
   //-----------------------------------------------------------------------------------------------
@@ -118,7 +119,7 @@ namespace cryptonote
   //-----------------------------------------------------------------------------------------------
   bool core::init(const boost::program_options::variables_map& vm, bool testnet)
   {
-    bool r = handle_command_line(vm);
+    bool r = handle_command_line(vm, testnet);
 
     r = m_mempool.init(m_config_folder);
     CHECK_AND_ASSERT_MES(r, false, "Failed to initialize memory pool");

src/cryptonote_core/cryptonote_core.h

@@ -136,7 +136,7 @@ namespace cryptonote
      bool check_tx_ring_signature(const txin_to_key& tx, const crypto::hash& tx_prefix_hash, const std::vector<crypto::signature>& sig);
      bool is_tx_spendtime_unlocked(uint64_t unlock_time);
      bool update_miner_block_template();
-     bool handle_command_line(const boost::program_options::variables_map& vm);
+     bool handle_command_line(const boost::program_options::variables_map& vm, bool testnet);
      bool on_update_blocktemplate_interval();
      bool check_tx_inputs_keyimages_diff(const transaction& tx);
 

src/daemon/daemon.cpp

@@ -63,8 +63,11 @@ namespace
   const command_line::arg_descriptor<std::string> arg_log_file    = {"log-file", "", ""};
   const command_line::arg_descriptor<int>         arg_log_level   = {"log-level", "", LOG_LEVEL_0};
   const command_line::arg_descriptor<bool>        arg_console     = {"no-console", "Disable daemon console commands"};
-  const command_line::arg_descriptor<bool>        arg_testnet_on  = {"testnet", "Used to deploy test nets. Checkpoints and hardcoded seeds are ignored, "
+  const command_line::arg_descriptor<bool>        arg_testnet_on  = {
-    "network id is changed. Use it with --data-dir flag. The wallet must be launched with --testnet flag.", false};
+      "testnet"
+    , "Run on testnet. The wallet must be launched with --testnet flag."
+    , false
+    };
 }
 
 bool command_line_preprocessor(const boost::program_options::variables_map& vm)
@@ -113,6 +116,9 @@ int main(int argc, char* argv[])
 
   TRY_ENTRY();  
 
+  boost::filesystem::path default_data_path {tools::get_default_data_dir()};
+  boost::filesystem::path default_testnet_data_path {default_data_path / "testnet"};
+
   po::options_description desc_cmd_only("Command line options");
   po::options_description desc_cmd_sett("Command line options and settings options");
 
@@ -120,7 +126,8 @@ int main(int argc, char* argv[])
   command_line::add_arg(desc_cmd_only, command_line::arg_version);
   command_line::add_arg(desc_cmd_only, arg_os_version);
   // tools::get_default_data_dir() can't be called during static initialization
-  command_line::add_arg(desc_cmd_only, command_line::arg_data_dir, tools::get_default_data_dir());
+  command_line::add_arg(desc_cmd_only, command_line::arg_data_dir, default_data_path.string());
+  command_line::add_arg(desc_cmd_only, command_line::arg_testnet_data_dir, default_testnet_data_path.string());
   command_line::add_arg(desc_cmd_only, arg_config_file);
 
   command_line::add_arg(desc_cmd_sett, arg_log_file);
@@ -140,15 +147,25 @@ int main(int argc, char* argv[])
   bool r = command_line::handle_error_helper(desc_options, [&]()
   {
     po::store(po::parse_command_line(argc, argv, desc_options), vm);
+    po::notify(vm);
+
+    return true;
+  });
+  if (!r)
+    return 1;
 
   if (command_line::get_arg(vm, command_line::arg_help))
   {
-      std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL << ENDL;
+    std::cout << CRYPTONOTE_NAME << " v" << PROJECT_VERSION_LONG << ENDL << ENDL;
     std::cout << desc_options << std::endl;
     return false;
   }
 
-    std::string data_dir = command_line::get_arg(vm, command_line::arg_data_dir);
+  bool testnet_mode = command_line::get_arg(vm, arg_testnet_on);
+
+  auto data_dir_arg = testnet_mode ? command_line::arg_testnet_data_dir : command_line::arg_data_dir;
+
+  std::string data_dir = command_line::get_arg(vm, data_dir_arg);
   std::string config = command_line::get_arg(vm, arg_config_file);
 
   boost::filesystem::path data_dir_path(data_dir);
@@ -163,12 +180,6 @@ int main(int argc, char* argv[])
   {
     po::store(po::parse_config_file<char>(config_path.string<std::string>().c_str(), desc_cmd_sett), vm);
   }
-    po::notify(vm);
-
-    return true;
-  });
-  if (!r)
-    return 1;
 
   //set up logging options
   boost::filesystem::path log_file_path(command_line::get_arg(vm, arg_log_file));
@@ -195,7 +206,6 @@ int main(int argc, char* argv[])
   //create objects and link them
   cryptonote::core ccore(NULL);
 
-  bool testnet_mode = command_line::get_arg(vm, arg_testnet_on);
   if (testnet_mode) {
     LOG_PRINT_L0("Starting in testnet mode!");
   } else {