tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions 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
parent 7d928be240 57c0b1ed9f
commit 0f27fc57ac
18 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet2.cpp
+4 -4
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");
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
}
}
@@ -2777,9 +2777,9 @@ 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));
// 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,
(boost::format("%s wallet can not be opened as %s wallet")
% (field_nettype == 0 ? "Mainnet" : field_nettype == 1 ? "Testnet" : "Stagenet")
% (m_nettype == MAINNET ? "mainnet" : m_nettype == TESTNET ? "testnet" : "stagenet")).str());
(boost::format("%s wallet cannot be opened as %s wallet")
% (field_nettype == 0 ? "Mainnet" : field_nettype == 1 ? "Testnet" : "Stagenet")
% (m_nettype == MAINNET ? "mainnet" : m_nettype == TESTNET ? "testnet" : "stagenet")).str());
}
else
{
src/wallet/wallet_errors.h
+1 -1
View File
@@ -391,7 +391,7 @@ namespace tools
struct get_tx_pool_error : public refresh_error
{
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")
{
}
src/wallet/wallet_rpc_server.cpp
+1 -1
View File
@@ -2684,7 +2684,7 @@ namespace tools
}
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;