nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/epee/include/net/http_client.h
View File

@ -946,7 +946,7 @@ namespace net_utils
}else }else
{ //Apparently there are no signs of the form of transfer, will receive data until the connection is closed { //Apparently there are no signs of the form of transfer, will receive data until the connection is closed
m_state = reciev_machine_state_error; 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;
} }
return false; return false;

2
contrib/epee/include/net/levin_client_async.h
View File

@ -150,7 +150,7 @@ namespace levin
{ {
if( !reconnect() ) if( !reconnect() )
{ {
LOG_ERROR("Reconnect Failed. Failed to invoke() becouse not connected!"); LOG_ERROR("Reconnect Failed. Failed to invoke() because not connected!");
return false; return false;
} }
} }

2
contrib/epee/tests/src/net/test_net.h
View File

@ -261,7 +261,7 @@ namespace tests
boost::thread th1( boost::bind(&test_levin_server::run, &srv1)); boost::thread th1( boost::bind(&test_levin_server::run, &srv1));
boost::thread th2( boost::bind(&test_levin_server::run, &srv2)); 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); misc_utils::sleep_no_w(1000);

2
src/cryptonote_basic/miner.cpp
View File

@ -91,7 +91,7 @@ namespace cryptonote
const command_line::arg_descriptor<bool> 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<bool> 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<uint64_t> 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<uint64_t> 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<uint16_t> 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<uint16_t> 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<uint16_t> 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<uint16_t> 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};
} }

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; cumulative_size = txs_size + coinbase_blob_size;
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE) #if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
MDEBUG("Creating block template: miner tx size " << coinbase_blob_size << 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 #endif
continue; continue;
} }
@ -1247,7 +1247,7 @@ bool Blockchain::create_block_template(block& b, const account_public_address& m
#if defined(DEBUG_CREATE_BLOCK_TEMPLATE) #if defined(DEBUG_CREATE_BLOCK_TEMPLATE)
MDEBUG("Creating block template: miner tx size " << coinbase_blob_size << MDEBUG("Creating block template: miner tx size " << coinbase_blob_size <<
", cumulative size " << txs_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 #endif
b.miner_tx.extra.insert(b.miner_tx.extra.end(), delta, 0); 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. //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 = { static const command_line::arg_descriptor<uint64_t> arg_test_drop_download_height = {
"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 , 0
}; };
static const command_line::arg_descriptor<int> arg_test_dbg_lock_sleep = { 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"); LOG_PRINT_L1("Block found but, seems that reorganize just happened after that, do not relay this block");
return true; 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()); << ", b.tx_hashes.size()=" << b.tx_hashes.size() << ", missed_txs.size()" << missed_txs.size());
block_to_blob(b, arg.b.block); 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); uint64_t outputs_amount = get_outs_money_amount(tx);
if(outputs_amount > inputs_amount) 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_verifivation_failed = true;
tvc.m_overspend = true; tvc.m_overspend = true;
return false; return false;
@ -292,7 +292,7 @@ namespace cryptonote
} }
catch (const std::exception &e) 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; return false;
} }
tvc.m_added_to_pool = true; tvc.m_added_to_pool = true;

2
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -1395,7 +1395,7 @@ skip:
const uint64_t first_block_height_needed = span.first; 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; 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 << " 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) 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"); MDEBUG(context << " we are missing some of the necessary hashes for this gap, requesting chain again");

2
src/daemon/p2p.h
View File

@ -65,7 +65,7 @@ public:
{ {
throw std::runtime_error("Failed to initialize p2p server."); throw std::runtime_error("Failed to initialize p2p server.");
} }
MGINFO("P2p server initialized OK"); MGINFO("p2p server initialized OK");
} }
t_node_server & get() t_node_server & get()

2
src/gen_multisig/gen_multisig.cpp
View File

@ -69,7 +69,7 @@ namespace
{ {
const command_line::arg_descriptor<std::string> arg_filename_base = {"filename-base", genms::tr("Base filename (-1, -2, etc suffixes will be appended as needed)"), ""}; const command_line::arg_descriptor<std::string> arg_filename_base = {"filename-base", genms::tr("Base filename (-1, -2, etc suffixes will be appended as needed)"), ""};
const command_line::arg_descriptor<std::string> arg_scheme = {"scheme", genms::tr("Give threshold and participants at once as M/N"), ""}; const command_line::arg_descriptor<std::string> arg_scheme = {"scheme", genms::tr("Give threshold and participants at once as M/N"), ""};
const command_line::arg_descriptor<uint32_t> arg_participants = {"participants", genms::tr("How many participants wil share parts of the multisig wallet"), 0}; const command_line::arg_descriptor<uint32_t> arg_participants = {"participants", genms::tr("How many participants will share parts of the multisig wallet"), 0};
const command_line::arg_descriptor<uint32_t> arg_threshold = {"threshold", genms::tr("How many signers are required to sign a valid transaction"), 0}; const command_line::arg_descriptor<uint32_t> arg_threshold = {"threshold", genms::tr("How many signers are required to sign a valid transaction"), 0};
const command_line::arg_descriptor<bool, false> arg_testnet = {"testnet", genms::tr("Create testnet multisig wallets"), false}; const command_line::arg_descriptor<bool, false> arg_testnet = {"testnet", genms::tr("Create testnet multisig wallets"), false};
const command_line::arg_descriptor<bool, false> arg_stagenet = {"stagenet", genms::tr("Create stagenet multisig wallets"), false}; const command_line::arg_descriptor<bool, false> arg_stagenet = {"stagenet", genms::tr("Create stagenet multisig wallets"), false};

4
src/rpc/core_rpc_server.cpp
View File

@ -905,7 +905,7 @@ namespace cryptonote
PERF_TIMER(on_save_bc); PERF_TIMER(on_save_bc);
if( !m_core.get_blockchain_storage().store_blockchain() ) if( !m_core.get_blockchain_storage().store_blockchain() )
{ {
res.status = "Error while storing blockhain"; res.status = "Error while storing blockchain";
return true; return true;
} }
res.status = CORE_RPC_STATUS_OK; res.status = CORE_RPC_STATUS_OK;
@ -1102,7 +1102,7 @@ namespace cryptonote
if(req.reserve_size > 255) if(req.reserve_size > 255)
{ {
error_resp.code = CORE_RPC_ERROR_CODE_TOO_BIG_RESERVE_SIZE; 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; return false;
} }

2
src/simplewallet/simplewallet.cpp
View File

@ -2046,7 +2046,7 @@ simple_wallet::simple_wallet()
m_cmd_binder.set_handler("address", m_cmd_binder.set_handler("address",
boost::bind(&simple_wallet::print_address, this, _1), boost::bind(&simple_wallet::print_address, this, _1),
tr("address [ new <label text with white spaces allowed> | all | <index_min> [<index_max>] | label <index> <label text with white spaces allowed>]"), tr("address [ new <label text with white spaces allowed> | all | <index_min> [<index_max>] | label <index> <label text with white spaces allowed>]"),
tr("If no arguments are specified or <index> is specified, the wallet shows the default or specified address. If \"all\" is specified, the walllet shows all the existing addresses in the currently selected account. If \"new \" is specified, the wallet creates a new address with the provided label text (which can be empty). If \"label\" is specified, the wallet sets the label of the address specified by <index> to the provided label text.")); tr("If no arguments are specified or <index> is specified, the wallet shows the default or specified address. If \"all\" is specified, the wallet shows all the existing addresses in the currently selected account. If \"new \" is specified, the wallet creates a new address with the provided label text (which can be empty). If \"label\" is specified, the wallet sets the label of the address specified by <index> to the provided label text."));
m_cmd_binder.set_handler("integrated_address", m_cmd_binder.set_handler("integrated_address",
boost::bind(&simple_wallet::print_integrated_address, this, _1), boost::bind(&simple_wallet::print_integrated_address, this, _1),
tr("integrated_address [<payment_id> | <address>]"), tr("integrated_address [<payment_id> | <address>]"),

4
src/wallet/wallet2.cpp
View File

@ -1632,7 +1632,7 @@ void wallet2::pull_blocks(uint64_t start_height, uint64_t &blocks_start_height,
THROW_WALLET_EXCEPTION_IF(*result == CORE_RPC_STATUS_BUSY, tools::error::daemon_busy, "getversion"); THROW_WALLET_EXCEPTION_IF(*result == CORE_RPC_STATUS_BUSY, tools::error::daemon_busy, "getversion");
if (*result != CORE_RPC_STATUS_OK) if (*result != CORE_RPC_STATUS_OK)
{ {
MDEBUG("Cannot determined daemon RPC version, not asking for pruned blocks"); MDEBUG("Cannot determine daemon RPC version, not asking for pruned blocks");
req.prune = false; // old daemon req.prune = false; // old daemon
} }
} }
@ -2777,7 +2777,7 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, nettype, uint8_t, Uint, false, static_cast<uint8_t>(m_nettype)); GET_FIELD_FROM_JSON_RETURN_ON_ERROR(json, nettype, uint8_t, Uint, false, static_cast<uint8_t>(m_nettype));
// The network type given in the program argument is inconsistent with the network type saved in the wallet // The network type given in the program argument is inconsistent with the network type saved in the wallet
THROW_WALLET_EXCEPTION_IF(static_cast<uint8_t>(m_nettype) != field_nettype, error::wallet_internal_error, THROW_WALLET_EXCEPTION_IF(static_cast<uint8_t>(m_nettype) != field_nettype, error::wallet_internal_error,
(boost::format("%s wallet can not be opened as %s wallet") (boost::format("%s wallet cannot be opened as %s wallet")
% (field_nettype == 0 ? "Mainnet" : field_nettype == 1 ? "Testnet" : "Stagenet") % (field_nettype == 0 ? "Mainnet" : field_nettype == 1 ? "Testnet" : "Stagenet")
% (m_nettype == MAINNET ? "mainnet" : m_nettype == TESTNET ? "testnet" : "stagenet")).str()); % (m_nettype == MAINNET ? "mainnet" : m_nettype == TESTNET ? "testnet" : "stagenet")).str());
} }

2
src/wallet/wallet_errors.h
View File

@ -391,7 +391,7 @@ namespace tools
struct get_tx_pool_error : public refresh_error struct get_tx_pool_error : public refresh_error
{ {
explicit get_tx_pool_error(std::string&& loc) explicit get_tx_pool_error(std::string&& loc)
: refresh_error(std::move(loc), "error getting tranaction pool") : refresh_error(std::move(loc), "error getting transaction pool")
{ {
} }

2
src/wallet/wallet_rpc_server.cpp
View File

@ -2684,7 +2684,7 @@ namespace tools
} }
else else
{ {
er.message = "Success, but cannot update spent status after import multisig info as dameon is untrusted"; er.message = "Success, but cannot update spent status after import multisig info as daemon is untrusted";
} }
return true; return true;

6
tests/libwallet_api_tests/scripts/README.md
View File

@ -3,7 +3,7 @@
## Environment for the tests ## Environment for the tests
* Running monero node, linked to private/public testnet. * Running monero node, linked to private/public testnet.
By default, tests expect daemon running at ```localhost:38081```, By default, tests expect daemon running at ```localhost:38081```,
can we overriden with environment variable ```TESTNET_DAEMON_ADDRESS=<your_daemon_address>``` can be overridden with environment variable ```TESTNET_DAEMON_ADDRESS=<your_daemon_address>```
[Manual](https://github.com/moneroexamples/private-testnet) explaining how to run private testnet. [Manual](https://github.com/moneroexamples/private-testnet) explaining how to run private testnet.
* Directory with pre-generated wallets * Directory with pre-generated wallets
@ -18,7 +18,7 @@
when running first time, please uncomment line ```#create_wallet wallet_m``` to create miner wallet as well. when running first time, please uncomment line ```#create_wallet wallet_m``` to create miner wallet as well.
This wallet should be used for mining and all test wallets supposed to be seed from this miner wallet This wallet should be used for mining and all test wallets supposed to be seed from this miner wallet
* ```mining_start.sh``` and ```mining_stop.sh``` - helper scripts to start and stop mining on miner waller * ```mining_start.sh``` and ```mining_stop.sh``` - helper scripts to start and stop mining on miner wallet
* ```send_funds.sh``` - script for seeding test wallets. Please run this script when you have ehough money on miner wallet * ```send_funds.sh``` - script for seeding test wallets. Please run this script when you have enough money on miner wallet

2
tests/net_load_tests/srv.cpp
View File

@ -132,7 +132,7 @@ namespace
int handle_shutdown(int command, const CMD_SHUTDOWN::request& req, test_connection_context& /*context*/) int handle_shutdown(int command, const CMD_SHUTDOWN::request& req, test_connection_context& /*context*/)
{ {
LOG_PRINT_L0("Got shutdown requst. Shutting down..."); LOG_PRINT_L0("Got shutdown request. Shutting down...");
m_tcp_server.send_stop_signal(); m_tcp_server.send_stop_signal();
return 1; return 1;
} }

4
translations/monero.ts
View File

@ -1607,7 +1607,7 @@ If the &quot;tag_description&quot; argument is specified, the tag &lt;tag_name&g
</message> </message>
<message> <message>
<location filename="../src/simplewallet/simplewallet.cpp" line="1653"/> <location filename="../src/simplewallet/simplewallet.cpp" line="1653"/>
<source>If no arguments are specified or &lt;index&gt; is specified, the wallet shows the default or specified address. If &quot;all&quot; is specified, the walllet shows all the existing addresses in the currently selected account. If &quot;new &quot; is specified, the wallet creates a new address with the provided label text (which can be empty). If &quot;label&quot; is specified, the wallet sets the label of the address specified by &lt;index&gt; to the provided label text.</source> <source>If no arguments are specified or &lt;index&gt; is specified, the wallet shows the default or specified address. If &quot;all&quot; is specified, the wallet shows all the existing addresses in the currently selected account. If &quot;new &quot; is specified, the wallet creates a new address with the provided label text (which can be empty). If &quot;label&quot; is specified, the wallet sets the label of the address specified by &lt;index&gt; to the provided label text.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -3528,7 +3528,7 @@ Outputs per *: </source>
</message> </message>
<message> <message>
<location filename="../src/gen_multisig/gen_multisig.cpp" line="72"/> <location filename="../src/gen_multisig/gen_multisig.cpp" line="72"/>
<source>How many participants wil share parts of the multisig wallet</source> <source>How many participants will share parts of the multisig wallet</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>