github-jwinterm/aeon
1
0
Fork 0
mirror of https://github.com/jwinterm/aeon.git synced 2026-10-17 05:01:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from iamsmooth/master

Browse Source 
cosmetic fixes for status displays needed for hard fork 1
This commit is contained in:
aeonix
2015-07-22 13:35:41 -07:00
parent ab4989f0bd a3bb49925b
commit bf1f6c7e06
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptonote_protocol/cryptonote_protocol_handler.inl
+1 -1
View File
@@ -183,7 +183,7 @@ namespace cryptonote
int64_t diff = static_cast<int64_t>(hshd.current_height) - static_cast<int64_t>(m_core.get_current_blockchain_height());
LOG_PRINT_CCONTEXT_YELLOW("Sync data returned unknown top block: " << m_core.get_current_blockchain_height() << " -> " << hshd.current_height
<< " [" << std::abs(diff) << " blocks (" << (std::min(m_core.get_current_blockchain_height(),hshd.current_height) < HARDFORK_1_HEIGHT ? std::to_string(diff) + " blocks) " : std::to_string(diff / (24 * 60 * 60 / DIFFICULTY_TARGET)) +" days) ")
<< " [" << std::abs(diff) << " blocks " << (std::min(m_core.get_current_blockchain_height(),hshd.current_height) < HARDFORK_1_HEIGHT ? "" : "("+std::to_string(diff / (24 * 60 * 60 / DIFFICULTY_TARGET)) +" days) ")
<< (0 <= diff ? std::string("behind") : std::string("ahead"))
<< "] " << ENDL << "SYNCHRONIZATION started", (is_inital ? LOG_LEVEL_0:LOG_LEVEL_1));
LOG_PRINT_L1("Remote top block height: " << hshd.current_height << ", id: " << hshd.top_id);
src/daemon/daemon_commands_handler.h
+1 -1
View File
@@ -134,7 +134,7 @@ private:
uint64_t height = m_srv.get_payload_object().get_core().get_blockchain_storage().get_current_blockchain_height();
LOG_PRINT_GREEN("BH: " << height << ", DIFF: " << difficulty
<< ", HR: " << (int) difficulty / 60L << " H/s", LOG_LEVEL_0);
<< ", HR: " << (int) difficulty / (height < HARDFORK_1_HEIGHT ? HARDFORK_1_OLD_TARGET : DIFFICULTY_TARGET) << " H/s", LOG_LEVEL_0);
return true;
}