From aefe02f790e905ce58a532e03d4f37c4d44c3bb1 Mon Sep 17 00:00:00 2001
From: Thomas Winget <tewinget@gmail.com>
Date: Tue, 10 Feb 2015 19:01:37 -0500
Subject: [PATCH] should fix testnet for daemonize

---
 src/daemon/core.h   | 10 ++++++++--
 src/daemon/main.cpp |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/daemon/core.h b/src/daemon/core.h
index 372665420..df61825d3 100644
--- a/src/daemon/core.h
+++ b/src/daemon/core.h
@@ -34,6 +34,7 @@
 #include "misc_log_ex.h"
 #include <stdexcept>
 #include <boost/program_options.hpp>
+#include "daemon/command_line_args.h"
 
 namespace daemonize
 {
@@ -59,10 +60,15 @@ public:
     : m_core{nullptr}
     , m_vm_HACK{vm}
   {
+    bool testnet = command_line::get_arg(vm, daemon_args::arg_testnet_on);
+
     cryptonote::checkpoints checkpoints;
-    if (!cryptonote::create_checkpoints(checkpoints))
+    if (!testnet)
     {
-      throw std::runtime_error("Failed to initialize checkpoints");
+      if (!cryptonote::create_checkpoints(checkpoints))
+      {
+        throw std::runtime_error("Failed to initialize checkpoints");
+      }
     }
     m_core.set_checkpoints(std::move(checkpoints));
   }
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index dc56bcdfc..b1130d774 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -60,6 +60,7 @@ int main(int argc, char const * argv[])
     po::positional_options_description positional_options;
     {
       bf::path default_data_dir = daemonizer::get_default_data_dir();
+      bf::path default_testnet_data_dir = {default_data_dir / "testnet"};
 
       // Misc Options
 
@@ -67,6 +68,7 @@ int main(int argc, char const * argv[])
       command_line::add_arg(visible_options, command_line::arg_version);
       command_line::add_arg(visible_options, daemon_args::arg_os_version);
       command_line::add_arg(visible_options, command_line::arg_data_dir, default_data_dir.string());
+      command_line::add_arg(visible_options, command_line::arg_testnet_data_dir, default_testnet_data_dir.string());
       bf::path default_conf = default_data_dir / std::string(CRYPTONOTE_NAME ".conf");
       command_line::add_arg(visible_options, daemon_args::arg_config_file, default_conf.string());