10 files changed, 1 insertions, 18 deletions
diff --git a/src/blockchain_utilities/blockchain_converter.cpp b/src/blockchain_utilities/blockchain_converter.cpp
index 17b6d81bf..7c33ec399 100644
--- a/src/blockchain_utilities/blockchain_converter.cpp
+++ b/src/blockchain_utilities/blockchain_converter.cpp
@@ -45,8 +45,6 @@
 #include <iostream>
 
 
-unsigned int epee::g_test_dbg_lock_sleep = 0;
-
 namespace
 {
 
diff --git a/src/blockchain_utilities/blockchain_dump.cpp b/src/blockchain_utilities/blockchain_dump.cpp
index 53dc22f8b..6fa5ce801 100644
--- a/src/blockchain_utilities/blockchain_dump.cpp
+++ b/src/blockchain_utilities/blockchain_dump.cpp
@@ -38,8 +38,6 @@
 #include "common/command_line.h"
 #include "version.h"
 
-unsigned int epee::g_test_dbg_lock_sleep = 0;
-
 namespace po = boost::program_options;
 using namespace epee; // log_space
 
diff --git a/src/blockchain_utilities/blockchain_export.cpp b/src/blockchain_utilities/blockchain_export.cpp
index f5dea731a..d90175a77 100644
--- a/src/blockchain_utilities/blockchain_export.cpp
+++ b/src/blockchain_utilities/blockchain_export.cpp
@@ -31,8 +31,6 @@
 #include "common/command_line.h"
 #include "version.h"
 
-unsigned int epee::g_test_dbg_lock_sleep = 0;
-
 namespace po = boost::program_options;
 using namespace epee; // log_space
 
diff --git a/src/blockchain_utilities/blockchain_import.cpp b/src/blockchain_utilities/blockchain_import.cpp
index 67ad24031..1aaf2bddc 100644
--- a/src/blockchain_utilities/blockchain_import.cpp
+++ b/src/blockchain_utilities/blockchain_import.cpp
@@ -44,8 +44,6 @@
 
 #include "fake_core.h"
 
-unsigned int epee::g_test_dbg_lock_sleep = 0;
-
 namespace
 {
 // CONFIG
diff --git a/src/blockchain_utilities/cn_deserialize.cpp b/src/blockchain_utilities/cn_deserialize.cpp
index 6c6288aec..bf02dc150 100644
--- a/src/blockchain_utilities/cn_deserialize.cpp
+++ b/src/blockchain_utilities/cn_deserialize.cpp
@@ -32,8 +32,6 @@
 #include "common/command_line.h"
 #include "version.h"
 
-unsigned int epee::g_test_dbg_lock_sleep = 0;
-
 namespace po = boost::program_options;
 using namespace epee; // log_space
 
diff --git a/src/connectivity_tool/conn_tool.cpp b/src/connectivity_tool/conn_tool.cpp
index 9f00300ae..458d30cc3 100644
--- a/src/connectivity_tool/conn_tool.cpp
+++ b/src/connectivity_tool/conn_tool.cpp
@@ -49,8 +49,6 @@ namespace po = boost::program_options;
 using namespace cryptonote;
 using namespace nodetool;
 
-unsigned int epee::g_test_dbg_lock_sleep = 0;
-
 namespace
 {
   const command_line::arg_descriptor<std::string, true> arg_ip           = {"ip", "set ip"};
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index ed6a66722..e79823d08 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -46,8 +46,6 @@ using namespace epee;
 
 #include <functional>
 
-unsigned int epee::g_test_dbg_lock_sleep = 0;
-
 namespace daemonize {
 
 struct t_internals {
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index 089d8fb69..0717fd89b 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -132,7 +132,7 @@ int main(int argc, char const * argv[])
       return 0;
     }
 
-    epee::g_test_dbg_lock_sleep = command_line::get_arg(vm, command_line::arg_test_dbg_lock_sleep);
+    epee::debug::g_test_dbg_lock_sleep() = command_line::get_arg(vm, command_line::arg_test_dbg_lock_sleep);
 
     std::string db_type = command_line::get_arg(vm, command_line::arg_db_type);
 
diff --git a/src/miner/simpleminer.cpp b/src/miner/simpleminer.cpp
index e04ffbbcf..ba956d90b 100644
--- a/src/miner/simpleminer.cpp
+++ b/src/miner/simpleminer.cpp
@@ -41,7 +41,6 @@
 
 using namespace epee;
 namespace po = boost::program_options;
-unsigned int epee::g_test_dbg_lock_sleep = 0;
 
 int main(int argc, char** argv)
 {
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 55bddcddd..e320a6243 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -73,8 +73,6 @@ typedef cryptonote::simple_wallet sw;
 
 #define EXTENDED_LOGS_FILE "wallet_details.log"
 
-unsigned int epee::g_test_dbg_lock_sleep = 0;
-
 #define DEFAULT_MIX 4
 
 namespace