Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #536 

9079a32 Fix typo (warptangent)
3796941 blockchain.cpp: Change indentation from 4 to 2 spaces (warptangent)
725acc7 Replace tabs with two spaces for consistency with rest of codebase (warptangent)
This commit is contained in:
Riccardo Spagni 2015-12-16 22:58:26 +02:00
parent 0576ff42b5 9079a32c07
commit 814c8241cd
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
26 changed files with 3563 additions and 3567 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cryptonote_core/blockchain.cpp
View File

@ -99,8 +99,8 @@ static const uint64_t testnet_hard_fork_version_1_till = 624633;
//------------------------------------------------------------------ //------------------------------------------------------------------
Blockchain::Blockchain(tx_memory_pool& tx_pool) : Blockchain::Blockchain(tx_memory_pool& tx_pool) :
m_db(), m_tx_pool(tx_pool), m_timestamps_and_difficulties_height(0), m_current_block_cumul_sz_limit(0), m_is_in_checkpoint_zone(false), m_db(), m_tx_pool(tx_pool), m_timestamps_and_difficulties_height(0), m_current_block_cumul_sz_limit(0), m_is_in_checkpoint_zone(false),
m_is_blockchain_storing(false), m_enforce_dns_checkpoints(false), m_max_prepare_blocks_threads(4), m_db_blocks_per_sync(1), m_db_sync_mode(db_async), m_fast_sync(true) m_is_blockchain_storing(false), m_enforce_dns_checkpoints(false), m_max_prepare_blocks_threads(4), m_db_blocks_per_sync(1), m_db_sync_mode(db_async), m_fast_sync(true)
{ {
LOG_PRINT_L3("Blockchain::" << __func__); LOG_PRINT_L3("Blockchain::" << __func__);
} }
@ -1010,7 +1010,7 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m
b.timestamp = time(NULL); b.timestamp = time(NULL);
diffic = get_difficulty_for_next_block(); diffic = get_difficulty_for_next_block();
CHECK_AND_ASSERT_MES(diffic, false, "difficulty owverhead."); CHECK_AND_ASSERT_MES(diffic, false, "difficulty overhead.");
median_size = m_current_block_cumul_sz_limit / 2; median_size = m_current_block_cumul_sz_limit / 2;
already_generated_coins = m_db->get_block_already_generated_coins(height - 1); already_generated_coins = m_db->get_block_already_generated_coins(height - 1);
@ -1270,7 +1270,6 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
LOG_PRINT_RED_L1("Block with id: " << epee::string_tools::pod_to_hex(id) << " (as alternative) has incorrect miner transaction."); LOG_PRINT_RED_L1("Block with id: " << epee::string_tools::pod_to_hex(id) << " (as alternative) has incorrect miner transaction.");
bvc.m_verifivation_failed = true; bvc.m_verifivation_failed = true;
return false; return false;
} }
// FIXME: // FIXME:
@ -1396,7 +1395,6 @@ bool Blockchain::handle_get_objects(NOTIFY_REQUEST_GET_OBJECTS::request& arg, NO
//pack transactions //pack transactions
BOOST_FOREACH(transaction& tx, txs) BOOST_FOREACH(transaction& tx, txs)
e.txs.push_back(t_serializable_object_to_blob(tx)); e.txs.push_back(t_serializable_object_to_blob(tx));
} }
//get another transactions, if need //get another transactions, if need
std::list<transaction> txs; std::list<transaction> txs;

2
src/cryptonote_core/blockchain_storage.cpp
View File

@ -661,7 +661,7 @@ bool blockchain_storage::create_block_template(block& b, const account_public_ad
b.timestamp = time(NULL); b.timestamp = time(NULL);
height = m_blocks.size(); height = m_blocks.size();
diffic = get_difficulty_for_next_block(); diffic = get_difficulty_for_next_block();
CHECK_AND_ASSERT_MES(diffic, false, "difficulty owverhead."); CHECK_AND_ASSERT_MES(diffic, false, "difficulty overhead.");
median_size = m_current_block_cumul_sz_limit / 2; median_size = m_current_block_cumul_sz_limit / 2;
already_generated_coins = m_blocks.back().already_generated_coins; already_generated_coins = m_blocks.back().already_generated_coins;

1
src/cryptonote_core/miner.cpp
View File

@ -357,7 +357,6 @@ namespace cryptonote
if(local_template_ver != m_template_no) if(local_template_ver != m_template_no)
{ {
CRITICAL_REGION_BEGIN(m_template_lock); CRITICAL_REGION_BEGIN(m_template_lock);
b = m_template; b = m_template;
local_diff = m_diffic; local_diff = m_diffic;

1
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -592,7 +592,6 @@ namespace cryptonote
epee::net_utils::data_logger::get_instance().add_data("calc_time", block_process_time + transactions_process_time); epee::net_utils::data_logger::get_instance().add_data("calc_time", block_process_time + transactions_process_time);
epee::net_utils::data_logger::get_instance().add_data("block_processing", 1); epee::net_utils::data_logger::get_instance().add_data("block_processing", 1);
} // each download block } // each download block
m_core.cleanup_handle_incoming_blocks(); m_core.cleanup_handle_incoming_blocks();