bc import: change sleeptime , cryptonote core: initialize testnet che…

…ckpoints

src/blockchain_utilities/blockchain_import.cpp

@@ -703,11 +703,11 @@ int main(int argc, char *argv[]) {
                   << ".\n"
                      "*********************************************************"
                      "********************************\n"
-                     "You have 90 seconds to press ^C or terminate this "
+                     "You have 10 seconds to press ^C or terminate this "
                      "program before unverified import starts\n"
                      "*********************************************************"
                      "********************************");
-    sleep(90);
+    sleep(10);
   }
 
   cryptonote::cryptonote_protocol_stub

src/checkpoints/checkpoints.cpp

@@ -196,7 +196,6 @@ bool checkpoints::init_default_checkpoints(network_type nettype) {
         9000,
         "dfda0b4ab55db760aac40164f4043e89b3733c31ebae00381b343c085056c57d",
         "0x3ceb638a1");
-
     return true;
   }
 

src/cryptonote_core/blockchain.cpp

@@ -1000,10 +1000,12 @@ std::pair<bool, uint64_t> Blockchain::check_difficulty_checkpoints() const {
   uint64_t res = 0;
   for (const std::pair<const uint64_t, difficulty_type> &i :
        m_checkpoints.get_difficulty_points()) {
-    if (i.first >= m_db->height())
+    if (i.first >= m_db->height()) {
       break;
-    if (m_db->get_block_cumulative_difficulty(i.first) != i.second)
+    }
+    if (m_db->get_block_cumulative_difficulty(i.first) != i.second) {
       return {false, res};
+    }
     res = i.first;
   }
   return {true, res};

src/cryptonote_core/cryptonote_core.cpp

@@ -325,8 +325,9 @@ bool core::handle_command_line(
 
   auto data_dir = boost::filesystem::path(m_config_folder);
 
+  cryptonote::checkpoints checkpoints;
+
   if (m_nettype == MAINNET) {
-    cryptonote::checkpoints checkpoints;
     if (!checkpoints.init_default_checkpoints(m_nettype)) {
       throw std::runtime_error("Failed to initialize checkpoints");
     }
@@ -338,6 +339,14 @@ bool core::handle_command_line(
     set_checkpoints_file_path(checkpoint_json_hashfile_fullpath.string());
   }
 
+  if (m_nettype == TESTNET) {
+    if (!checkpoints.init_default_checkpoints(m_nettype)) {
+      throw std::runtime_error("Failed to initialize checkpoints");
+    }
+
+    set_checkpoints(std::move(checkpoints));
+  }
+
   set_enforce_dns_checkpoints(command_line::get_arg(vm, arg_dns_checkpoints));
   test_drop_download_height(
       command_line::get_arg(vm, arg_test_drop_download_height));