aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-02-22 11:19:20 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-02-22 11:20:44 +0000
commit5901331669f7508362a1f8bd3603b344b5a8a0db (patch)
tree6d842f036ccf5a75c6523f3e720d316aab8b1156
parentupdates: we now have a user URL, and an automatic one (diff)
downloadmonero-5901331669f7508362a1f8bd3603b344b5a8a0db.tar.xz
updates: remove testnet case
It need not be any different
Diffstat (limited to '')
-rw-r--r--src/common/updates.cpp7
-rw-r--r--src/common/updates.h2
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp2
3 files changed, 4 insertions, 7 deletions
diff --git a/src/common/updates.cpp b/src/common/updates.cpp
index 3fa985e24..8878bb062 100644
--- a/src/common/updates.cpp
+++ b/src/common/updates.cpp
@@ -35,7 +35,7 @@
namespace tools
{
- bool check_updates(const std::string &software, const std::string &buildtag, bool testnet, std::string &version, std::string &hash)
+ bool check_updates(const std::string &software, const std::string &buildtag, std::string &version, std::string &hash)
{
std::vector<std::string> records;
bool found = false;
@@ -50,10 +50,7 @@ namespace tools
"updates.moneropulse.se"
};
- static const std::vector<std::string> testnet_dns_urls = { "testver.moneropulse.net"
- };
-
- if (!tools::dns_utils::load_txt_records_from_dns(records, testnet ? testnet_dns_urls : dns_urls))
+ if (!tools::dns_utils::load_txt_records_from_dns(records, dns_urls))
return false;
for (const auto& record : records)
diff --git a/src/common/updates.h b/src/common/updates.h
index d84b612df..e494ed7ac 100644
--- a/src/common/updates.h
+++ b/src/common/updates.h
@@ -32,6 +32,6 @@
namespace tools
{
- bool check_updates(const std::string &software, const std::string &buildtag, bool bestnet, std::string &version, std::string &hash);
+ bool check_updates(const std::string &software, const std::string &buildtag, std::string &version, std::string &hash);
std::string get_update_url(const std::string &software, const std::string &subdir, const std::string &buildtag, const std::string &version, bool user);
}
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 470c1feb3..98c53890e 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -1101,7 +1101,7 @@ namespace cryptonote
std::string version, hash;
MCDEBUG("updates", "Checking for a new " << software << " version for " << buildtag);
- if (!tools::check_updates(software, buildtag, m_testnet, version, hash))
+ if (!tools::check_updates(software, buildtag, version, hash))
return false;
if (tools::vercmp(version.c_str(), MONERO_VERSION) <= 0)