Merge pull request #570

fc34132 Remove assert from status command (hyc)
This commit is contained in:
Riccardo Spagni 2015-12-30 09:37:24 +02:00
commit aa6dd048d8
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -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) for (size_t n = version; n < 256; ++n)
votes += last_versions[n]; votes += last_versions[n];
threshold = (window * heights[current_version].threshold + 99) / 100; 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); earliest_height = get_earliest_ideal_height_for_version(version);
voting = heights.back().version; voting = heights.back().version;
return enabled; return enabled;