Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-13 22:45:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3336

Browse source 
57c0b1ed Fix typos in various files (Dimitris Apostolou)
This commit is contained in:
Riccardo Spagni 2018-03-16 18:08:06 +02:00
commit 0f27fc57ac
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
18 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cryptonote_core/blockchain.cpp
View file

@ -1236,7 +1236,7 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m
cumulative_size = txs_size + coinbase_blob_size;
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
MDEBUG("Creating block template: miner tx size " << coinbase_blob_size <<
", cumulative size " << cumulative_size << " is greater then before");
", cumulative size " << cumulative_size << " is greater than before");
#endif
continue;
}
@ -1247,7 +1247,7 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
MDEBUG("Creating block template: miner tx size " << coinbase_blob_size <<
", cumulative size " << txs_size + coinbase_blob_size <<
" is less then before, adding " << delta << " zero bytes");
" is less than before, adding " << delta << " zero bytes");
#endif
b.miner_tx.extra.insert(b.miner_tx.extra.end(), delta, 0);
//here could be 1 byte difference, because of extra field counter is varint, and it can become from 1-byte len to 2-bytes len.

4
src/cryptonote_core/cryptonote_core.cpp
View file

@ -104,7 +104,7 @@ namespace cryptonote
};
static const command_line::arg_descriptor<uint64_t> arg_test_drop_download_height = {
"test-drop-download-height"
, "Like test-drop-download but disards only after around certain height"
, "Like test-drop-download but discards only after around certain height"
, 0
};
static const command_line::arg_descriptor<int> arg_test_dbg_lock_sleep = {
@ -1174,7 +1174,7 @@ namespace cryptonote
LOG_PRINT_L1("Block found but, seems that reorganize just happened after that, do not relay this block");
return true;
}
CHECK_AND_ASSERT_MES(txs.size() == b.tx_hashes.size() && !missed_txs.size(), false, "cant find some transactions in found block:" << get_block_hash(b) << " txs.size()=" << txs.size()
CHECK_AND_ASSERT_MES(txs.size() == b.tx_hashes.size() && !missed_txs.size(), false, "can't find some transactions in found block:" << get_block_hash(b) << " txs.size()=" << txs.size()
<< ", b.tx_hashes.size()=" << b.tx_hashes.size() << ", missed_txs.size()" << missed_txs.size());
block_to_blob(b, arg.b.block);

4
src/cryptonote_core/tx_pool.cpp
View file

@ -153,7 +153,7 @@ namespace cryptonote
uint64_t outputs_amount = get_outs_money_amount(tx);
if(outputs_amount > inputs_amount)
{
LOG_PRINT_L1("transaction use more money then it has: use " << print_money(outputs_amount) << ", have " << print_money(inputs_amount));
LOG_PRINT_L1("transaction use more money than it has: use " << print_money(outputs_amount) << ", have " << print_money(inputs_amount));
tvc.m_verifivation_failed = true;
tvc.m_overspend = true;
return false;
@ -292,7 +292,7 @@ namespace cryptonote
}
catch (const std::exception &e)
{
MERROR("internal error: transaction already exists at inserting in memorypool: " << e.what());
MERROR("internal error: transaction already exists at inserting in memory pool: " << e.what());
return false;
}
tvc.m_added_to_pool = true;