hardfork: allow passing chain height in get(height) for convenience

This commit is contained in:
moneromooo-monero 2016-02-01 20:06:17 +00:00
parent 5feebb4d87
commit 64a2aa3376
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3

View File

@ -318,10 +318,13 @@ HardFork::State HardFork::get_state() const
uint8_t HardFork::get(uint64_t height) const uint8_t HardFork::get(uint64_t height) const
{ {
CRITICAL_REGION_LOCAL(lock); CRITICAL_REGION_LOCAL(lock);
if (height >= db.height()) { if (height > db.height()) {
assert(false); assert(false);
return 255; return 255;
} }
if (height == db.height()) {
return get_current_version();
}
return db.get_hard_fork_version(height); return db.get_hard_fork_version(height);
} }