From 57c0b1ed9f15ca27892a8737156c3b8e32a1625e Mon Sep 17 00:00:00 2001 From: Dimitris Apostolou Date: Thu, 1 Mar 2018 13:36:19 +0200 Subject: [PATCH] Fix typos in various files --- contrib/epee/include/net/http_client.h | 2 +- contrib/epee/include/net/levin_client_async.h | 2 +- contrib/epee/tests/src/net/test_net.h | 2 +- src/cryptonote_basic/miner.cpp | 2 +- src/cryptonote_core/blockchain.cpp | 4 ++-- src/cryptonote_core/cryptonote_core.cpp | 4 ++-- src/cryptonote_core/tx_pool.cpp | 4 ++-- src/cryptonote_protocol/cryptonote_protocol_handler.inl | 2 +- src/daemon/p2p.h | 2 +- src/gen_multisig/gen_multisig.cpp | 2 +- src/rpc/core_rpc_server.cpp | 4 ++-- src/simplewallet/simplewallet.cpp | 2 +- src/wallet/wallet2.cpp | 8 ++++---- src/wallet/wallet_errors.h | 2 +- src/wallet/wallet_rpc_server.cpp | 2 +- tests/libwallet_api_tests/scripts/README.md | 6 +++--- tests/net_load_tests/srv.cpp | 2 +- translations/monero.ts | 4 ++-- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/contrib/epee/include/net/http_client.h b/contrib/epee/include/net/http_client.h index 1edf65928..e01691794 100644 --- a/contrib/epee/include/net/http_client.h +++ b/contrib/epee/include/net/http_client.h @@ -946,7 +946,7 @@ namespace net_utils }else { //Apparently there are no signs of the form of transfer, will receive data until the connection is closed m_state = reciev_machine_state_error; - MERROR("Undefinded transfer type, consider http_body_transfer_connection_close method. header: " << m_header_cache); + MERROR("Undefined transfer type, consider http_body_transfer_connection_close method. header: " << m_header_cache); return false; } return false; diff --git a/contrib/epee/include/net/levin_client_async.h b/contrib/epee/include/net/levin_client_async.h index 6c8f9bcb3..b3a46465b 100644 --- a/contrib/epee/include/net/levin_client_async.h +++ b/contrib/epee/include/net/levin_client_async.h @@ -150,7 +150,7 @@ namespace levin { if( !reconnect() ) { - LOG_ERROR("Reconnect Failed. Failed to invoke() becouse not connected!"); + LOG_ERROR("Reconnect Failed. Failed to invoke() because not connected!"); return false; } } diff --git a/contrib/epee/tests/src/net/test_net.h b/contrib/epee/tests/src/net/test_net.h index 2e1b1e5fd..04fef089c 100644 --- a/contrib/epee/tests/src/net/test_net.h +++ b/contrib/epee/tests/src/net/test_net.h @@ -261,7 +261,7 @@ namespace tests boost::thread th1( boost::bind(&test_levin_server::run, &srv1)); boost::thread th2( boost::bind(&test_levin_server::run, &srv2)); - LOG_PRINT_L0("Initalized servers, waiting for worker threads started..."); + LOG_PRINT_L0("Initialized servers, waiting for worker threads started..."); misc_utils::sleep_no_w(1000); diff --git a/src/cryptonote_basic/miner.cpp b/src/cryptonote_basic/miner.cpp index f949bbd2b..2c777f5a2 100644 --- a/src/cryptonote_basic/miner.cpp +++ b/src/cryptonote_basic/miner.cpp @@ -91,7 +91,7 @@ namespace cryptonote const command_line::arg_descriptor arg_bg_mining_ignore_battery = {"bg-mining-ignore-battery", "if true, assumes plugged in when unable to query system power status", false, true}; const command_line::arg_descriptor arg_bg_mining_min_idle_interval_seconds = {"bg-mining-min-idle-interval", "Specify min lookback interval in seconds for determining idle state", miner::BACKGROUND_MINING_DEFAULT_MIN_IDLE_INTERVAL_IN_SECONDS, true}; const command_line::arg_descriptor arg_bg_mining_idle_threshold_percentage = {"bg-mining-idle-threshold", "Specify minimum avg idle percentage over lookback interval", miner::BACKGROUND_MINING_DEFAULT_IDLE_THRESHOLD_PERCENTAGE, true}; - const command_line::arg_descriptor arg_bg_mining_miner_target_percentage = {"bg-mining-miner-target", "Specificy maximum percentage cpu use by miner(s)", miner::BACKGROUND_MINING_DEFAULT_MINING_TARGET_PERCENTAGE, true}; + const command_line::arg_descriptor arg_bg_mining_miner_target_percentage = {"bg-mining-miner-target", "Specify maximum percentage cpu use by miner(s)", miner::BACKGROUND_MINING_DEFAULT_MINING_TARGET_PERCENTAGE, true}; } diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index d2d43490e..d659a423f 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -1255,7 +1255,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; } @@ -1266,7 +1266,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. diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 8c0118803..f19e4500d 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -104,7 +104,7 @@ namespace cryptonote }; static const command_line::arg_descriptor 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 arg_test_dbg_lock_sleep = { @@ -1169,7 +1169,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); diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 762feb5ee..0af9737a7 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -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; diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index 7c4f16c77..5d91ad569 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -1395,7 +1395,7 @@ skip: const uint64_t first_block_height_needed = span.first; const uint64_t last_block_height_needed = span.first + std::min(span.second, (uint64_t)count_limit) - 1; MDEBUG(context << " gap found, span: " << span.first << " - " << span.first + span.second - 1 << " (" << last_block_height_needed << ")"); - MDEBUG(context << " current known hashes from from " << first_block_height_known << " to " << last_block_height_known); + MDEBUG(context << " current known hashes from " << first_block_height_known << " to " << last_block_height_known); if (first_block_height_needed < first_block_height_known || last_block_height_needed > last_block_height_known) { MDEBUG(context << " we are missing some of the necessary hashes for this gap, requesting chain again"); diff --git a/src/daemon/p2p.h b/src/daemon/p2p.h index 7fcb03751..0f01c746d 100644 --- a/src/daemon/p2p.h +++ b/src/daemon/p2p.h @@ -65,7 +65,7 @@ public: { throw std::runtime_error("Failed to initialize p2p server."); } - MGINFO("P2p server initialized OK"); + MGINFO("p2p server initialized OK"); } t_node_server & get() diff --git a/src/gen_multisig/gen_multisig.cpp b/src/gen_multisig/gen_multisig.cpp index e165b8053..943589b4a 100644 --- a/src/gen_multisig/gen_multisig.cpp +++ b/src/gen_multisig/gen_multisig.cpp @@ -69,7 +69,7 @@ namespace { const command_line::arg_descriptor arg_filename_base = {"filename-base", genms::tr("Base filename (-1, -2, etc suffixes will be appended as needed)"), ""}; const command_line::arg_descriptor arg_scheme = {"scheme", genms::tr("Give threshold and participants at once as M/N"), ""}; - const command_line::arg_descriptor arg_participants = {"participants", genms::tr("How many participants wil share parts of the multisig wallet"), 0}; + const command_line::arg_descriptor arg_participants = {"participants", genms::tr("How many participants will share parts of the multisig wallet"), 0}; const command_line::arg_descriptor arg_threshold = {"threshold", genms::tr("How many signers are required to sign a valid transaction"), 0}; const command_line::arg_descriptor arg_testnet = {"testnet", genms::tr("Create testnet multisig wallets"), false}; const command_line::arg_descriptor arg_stagenet = {"stagenet", genms::tr("Create stagenet multisig wallets"), false}; diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 0e3e6757b..4d212dac6 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -905,7 +905,7 @@ namespace cryptonote PERF_TIMER(on_save_bc); if( !m_core.get_blockchain_storage().store_blockchain() ) { - res.status = "Error while storing blockhain"; + res.status = "Error while storing blockchain"; return true; } res.status = CORE_RPC_STATUS_OK; @@ -1102,7 +1102,7 @@ namespace cryptonote if(req.reserve_size > 255) { error_resp.code = CORE_RPC_ERROR_CODE_TOO_BIG_RESERVE_SIZE; - error_resp.message = "To big reserved size, maximum 255"; + error_resp.message = "Too big reserved size, maximum 255"; return false; } diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 3668df7b9..e9172b1da 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1739,7 +1739,7 @@ simple_wallet::simple_wallet() m_cmd_binder.set_handler("address", boost::bind(&simple_wallet::print_address, this, _1), tr("address [ new