Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix remaining bitmonero and simplewallet bits

Browse Source
This commit is contained in:
Riccardo Spagni 2016-09-03 22:03:44 +02:00
parent 04b120fb39
commit df63e0704a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
16 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.i18n
View File

@ -25,7 +25,7 @@ To build translations after modiying them:
To test a translation: To test a translation:
LANG=es ./build/release/bin/simplewallet LANG=es ./build/release/bin/monero-wallet-cli
To add new translatable sources in the source: To add new translatable sources in the source:

4
src/cryptonote_core/cryptonote_core.cpp
View File

@ -280,8 +280,8 @@ namespace cryptonote
{ {
LOG_PRINT_RED_L0("Found old-style blockchain.bin in " << old_files.string()); LOG_PRINT_RED_L0("Found old-style blockchain.bin in " << old_files.string());
LOG_PRINT_RED_L0("Monero now uses a new format. You can either remove blockchain.bin to start syncing"); LOG_PRINT_RED_L0("Monero now uses a new format. You can either remove blockchain.bin to start syncing");
LOG_PRINT_RED_L0("the blockchain anew, or use blockchain_export and blockchain_import to convert your"); LOG_PRINT_RED_L0("the blockchain anew, or use monero-blockchain-import and monero-blockchain-export to");
LOG_PRINT_RED_L0("existing blockchain.bin to the new format. See README.md for instructions."); LOG_PRINT_RED_L0("convert your existing blockchain.bin to the new format. See README.md for instructions.");
return false; return false;
} }
} }

2
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -706,7 +706,7 @@ namespace cryptonote
if(m_synchronized.compare_exchange_strong(val_expected, true)) if(m_synchronized.compare_exchange_strong(val_expected, true))
{ {
LOG_PRINT_L0(ENDL << "**********************************************************************" << ENDL LOG_PRINT_L0(ENDL << "**********************************************************************" << ENDL
<< "You are now synchronized with the network. You may now start simplewallet." << ENDL << "You are now synchronized with the network. You may now start monero-wallet-cli." << ENDL
<< ENDL << ENDL
<< "Please note, that the blockchain will be saved only after you quit the daemon with \"exit\" command or if you use \"save\" command." << ENDL << "Please note, that the blockchain will be saved only after you quit the daemon with \"exit\" command or if you use \"save\" command." << ENDL
<< "Otherwise, you will possibly need to synchronize the blockchain again." << ENDL << "Otherwise, you will possibly need to synchronize the blockchain again." << ENDL

4
src/daemon/rpc_command_executor.cpp
View File

@ -923,10 +923,10 @@ bool t_rpc_command_executor::print_status()
bool daemon_is_alive = m_rpc_client->check_connection(); bool daemon_is_alive = m_rpc_client->check_connection();
if(daemon_is_alive) { if(daemon_is_alive) {
tools::success_msg_writer() << "bitmonerod is running"; tools::success_msg_writer() << "monerod is running";
} }
else { else {
tools::fail_msg_writer() << "bitmonerod is NOT running"; tools::fail_msg_writer() << "monerod is NOT running";
} }
return true; return true;

10
src/simplewallet/simplewallet.cpp
View File

@ -1598,7 +1598,7 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
tr("Your wallet has been generated!\n" tr("Your wallet has been generated!\n"
"To start synchronizing with the daemon, use \"refresh\" command.\n" "To start synchronizing with the daemon, use \"refresh\" command.\n"
"Use \"help\" command to see the list of available commands.\n" "Use \"help\" command to see the list of available commands.\n"
"Always use \"exit\" command when closing simplewallet to save your\n" "Always use \"exit\" command when closing monero-wallet-cli to save your\n"
"current session's state. Otherwise, you might need to synchronize \n" "current session's state. Otherwise, you might need to synchronize \n"
"your wallet again (your wallet keys are NOT at risk in any case).\n") "your wallet again (your wallet keys are NOT at risk in any case).\n")
; ;
@ -3746,7 +3746,7 @@ int main(int argc, char* argv[])
return false; return false;
} }
// epee didn't find path to executable from argv[0], so use this default file name. // epee didn't find path to executable from argv[0], so use this default file name.
log_file_name = "simplewallet.log"; log_file_name = "monero-wallet-cli.log";
// The full path will use cwd because epee also returned an empty default log folder. // The full path will use cwd because epee also returned an empty default log folder.
} }
default_log /= log_file_name; default_log /= log_file_name;
@ -3779,7 +3779,7 @@ int main(int argc, char* argv[])
if (command_line::get_arg(vm, command_line::arg_help)) if (command_line::get_arg(vm, command_line::arg_help))
{ {
success_msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")"; success_msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
success_msg_writer() << sw::tr("Usage:") << " simplewallet [--wallet-file=<file>|--generate-new-wallet=<file>] [--daemon-address=<host>:<port>] [<COMMAND>]"; success_msg_writer() << sw::tr("Usage:") << " monero-wallet-cli [--wallet-file=<file>|--generate-new-wallet=<file>] [--daemon-address=<host>:<port>] [<COMMAND>]";
success_msg_writer() << desc_all; success_msg_writer() << desc_all;
return false; return false;
} }
@ -3798,8 +3798,8 @@ int main(int argc, char* argv[])
return 0; return 0;
// log_file_path // log_file_path
// default: < argv[0] directory >/simplewallet.log // default: < argv[0] directory >/monero-wallet-cli.log
// so if ran as "simplewallet" (no path), log file will be in cwd // so if ran as "monero-wallet-cli" (no path), log file will be in cwd
// //
// if log-file argument given: // if log-file argument given:
// absolute path // absolute path

2
tests/libwallet_api_tests/scripts/create_wallets.sh
View File

@ -2,7 +2,7 @@
function create_wallet { function create_wallet {
wallet_name=$1 wallet_name=$1
echo 0 | simplewallet --testnet --trusted-daemon --daemon-address localhost:38081 --generate-new-wallet $wallet_name --password "" --restore-height=1 echo 0 | monero-wallet-cli --testnet --trusted-daemon --daemon-address localhost:38081 --generate-new-wallet $wallet_name --password "" --restore-height=1
} }

2
tests/libwallet_api_tests/scripts/mining_start.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
rlwrap simplewallet --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_m.log start_mining rlwrap monero-wallet-cli --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_m.log start_mining

2
tests/libwallet_api_tests/scripts/mining_stop.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
rlwrap simplewallet --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_miner.log stop_mining rlwrap monero-wallet-cli --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_miner.log stop_mining

2
tests/libwallet_api_tests/scripts/open_wallet_1.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
rlwrap simplewallet --wallet-file wallet_01.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_01.log rlwrap monero-wallet-cli --wallet-file wallet_01.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_01.log

2
tests/libwallet_api_tests/scripts/open_wallet_2.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
rlwrap simplewallet --wallet-file wallet_02.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_01.log rlwrap monero-wallet-cli --wallet-file wallet_02.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_01.log

2
tests/libwallet_api_tests/scripts/open_wallet_3.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
rlwrap simplewallet --wallet-file wallet_03.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_03.log rlwrap monero-wallet-cli --wallet-file wallet_03.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_03.log

2
tests/libwallet_api_tests/scripts/open_wallet_4.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
rlwrap simplewallet --wallet-file wallet_04.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_04.log rlwrap monero-wallet-cli --wallet-file wallet_04.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_04.log

2
tests/libwallet_api_tests/scripts/open_wallet_5.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
rlwrap simplewallet --wallet-file wallet_05.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_05.log rlwrap monero-wallet-cli --wallet-file wallet_05.bin --password "" --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_05.log

2
tests/libwallet_api_tests/scripts/open_wallet_miner.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
rlwrap simplewallet --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address 127.0.0.1:38081 --log-file wallet_m.log rlwrap monero-wallet-cli --wallet-file wallet_m --password "" --testnet --trusted-daemon --daemon-address 127.0.0.1:38081 --log-file wallet_m.log

2
tests/libwallet_api_tests/scripts/send_funds.sh
View File

@ -6,7 +6,7 @@ function send_funds {
local amount=$1 local amount=$1
local dest=$(cat "$2.address.txt") local dest=$(cat "$2.address.txt")
simplewallet --wallet-file wallet_m --password "" \ monero-wallet-cli --wallet-file wallet_m --password "" \
--testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_m.log \ --testnet --trusted-daemon --daemon-address localhost:38081 --log-file wallet_m.log \
--command transfer $dest $amount --command transfer $dest $amount
} }

2
translations/monero.ts
View File

@ -311,7 +311,7 @@ Wallet file name: </source>
<source>Your wallet has been generated. <source>Your wallet has been generated.
To start synchronizing with the daemon use &quot;refresh&quot; command. To start synchronizing with the daemon use &quot;refresh&quot; command.
Use &quot;help&quot; command to see the list of available commands. Use &quot;help&quot; command to see the list of available commands.
Always use &quot;exit&quot; command when closing simplewallet to save Always use &quot;exit&quot; command when closing monero-wallet-cli to save
current session&apos;s state. Otherwise, you will possibly need to synchronize current session&apos;s state. Otherwise, you will possibly need to synchronize
your wallet again. Your wallet key is NOT under risk anyway. your wallet again. Your wallet key is NOT under risk anyway.
</source> </source>