aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-12-30 09:37:24 +0200
committerRiccardo Spagni <ric@spagni.net>2015-12-30 09:37:25 +0200
commitaa6dd048d8dab1bc914506d3d43b03d7bcc1cc3d (patch)
tree664740b7dec01ac3669b0540bdd2f8837c39f4ed /src
parentMerge pull request #569 (diff)
parentRemove assert from status command (diff)
downloadmonero-aa6dd048d8dab1bc914506d3d43b03d7bcc1cc3d.tar.xz
Merge pull request #570
fc34132 Remove assert from status command (hyc)
Diffstat (limited to 'src')
-rw-r--r--src/cryptonote_core/hardfork.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/hardfork.cpp b/src/cryptonote_core/hardfork.cpp
index 14d731108..e8ac7be98 100644
--- a/src/cryptonote_core/hardfork.cpp
+++ b/src/cryptonote_core/hardfork.cpp
@@ -375,7 +375,7 @@ bool HardFork::get_voting_info(uint8_t version, uint32_t &window, uint32_t &vote
for (size_t n = version; n < 256; ++n)
votes += last_versions[n];
threshold = (window * heights[current_version].threshold + 99) / 100;
- assert((votes >= threshold) == enabled);
+ //assert((votes >= threshold) == enabled);
earliest_height = get_earliest_ideal_height_for_version(version);
voting = heights.back().version;
return enabled;