cleanup

fireice-uk · Nov 15, 2019 · f8d367e · f8d367e
1 parent e72a80d
commit f8d367e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ XMR-Stak-RX is a universal free and open source stratum pool miner. This miner s
 * [Supported coins and algorithms](#supported-coins-and-algorithms)
 * [Download](#download)
 * [FAQ](doc/FAQ.md)
-* [Developer Donation](#default-developer-donation)
+* [Developer Donation](#developer-donation)
 * [Developer PGP Key's](doc/pgp_keys.md)
 
 ## Guides and FAQ
@@ -67,9 +67,9 @@ Please note, this list is not complete and is not an endorsement.
 
 You can find the latest releases and precompiled binaries on GitHub under [Releases](https://github.com/fireice-uk/xmr-stak/releases).
 
-## Default Developer Donation
+## Developer Donation
 
-If you want to donate directly to support further development, here is my wallet
+If you want to donate directly to support further development, here are our wallets
 
 fireice-uk:
 ```

diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp
@@ -24,7 +24,6 @@
 #include "xmrstak/backend/backendConnector.hpp"
 #include "xmrstak/backend/globalStates.hpp"
 #include "xmrstak/backend/miner_work.hpp"
-#include "xmrstak/donate-level.hpp"
 #include "xmrstak/jconf.hpp"
 #include "xmrstak/misc/configEditor.hpp"
 #include "xmrstak/misc/console.hpp"

diff --git a/xmrstak/donate-level.hpp b/xmrstak/donate-level.hpp
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
@@ -32,7 +32,6 @@
 #include "xmrstak/backend/iBackend.hpp"
 #include "xmrstak/backend/miner_work.hpp"
 
-#include "xmrstak/donate-level.hpp"
 #include "xmrstak/http/webdesign.hpp"
 #include "xmrstak/jconf.hpp"
 #include "xmrstak/misc/console.hpp"

diff --git a/xmrstak/misc/executor.hpp b/xmrstak/misc/executor.hpp
@@ -3,7 +3,6 @@
 #include "telemetry.hpp"
 #include "thdq.hpp"
 #include "xmrstak/backend/iBackend.hpp"
-#include "xmrstak/donate-level.hpp"
 #include "xmrstak/misc/environment.hpp"
 #include "xmrstak/net/msgstruct.hpp"
 

diff --git a/xmrstak/version.cpp b/xmrstak/version.cpp
@@ -37,7 +37,7 @@
 #define XMRSTAK_PP_TOSTRING1(str) #str
 #define XMRSTAK_PP_TOSTRING(str) XMRSTAK_PP_TOSTRING1(str)
 
-#define VERSION_LONG XMR_STAK_NAME "/" XMR_STAK_VERSION "/" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) "/" XMRSTAK_PP_TOSTRING(GIT_BRANCH) "/" OS_TYPE "/" XMRSTAK_PP_TOSTRING(BACKEND_TYPE) "/"
+#define VERSION_LONG XMR_STAK_NAME "/" XMR_STAK_VERSION "/" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH) "/" XMRSTAK_PP_TOSTRING(GIT_BRANCH) "/" OS_TYPE "/" XMRSTAK_PP_TOSTRING(BACKEND_TYPE)
 #define VERSION_SHORT XMR_STAK_NAME " " XMR_STAK_VERSION " " XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH)
 #define VERSION_HTML "v" XMR_STAK_VERSION "-" XMRSTAK_PP_TOSTRING(GIT_COMMIT_HASH)
 

diff --git a/xmrstak/version.hpp b/xmrstak/version.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "donate-level.hpp"
 #include <inttypes.h>
 #include <string>
 
@@ -10,7 +9,7 @@ extern const char ver_html[];
 
 inline std::string get_version_str()
 {
-	return std::string(ver_long) + std::to_string(uint32_t(fDevDonationLevel * 1000));
+	return std::string(ver_long);
 }
 
 inline std::string get_version_str_short()