From df63e0704aaed8ca4ce89f84586978c0b714ebf8 Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Sat, 3 Sep 2016 22:03:44 +0200 Subject: [PATCH] fix remaining bitmonero and simplewallet bits --- README.i18n | 2 +- src/cryptonote_core/cryptonote_core.cpp | 4 ++-- .../cryptonote_protocol_handler.inl | 2 +- src/daemon/rpc_command_executor.cpp | 4 ++-- src/simplewallet/simplewallet.cpp | 10 +++++----- tests/libwallet_api_tests/scripts/create_wallets.sh | 2 +- tests/libwallet_api_tests/scripts/mining_start.sh | 2 +- tests/libwallet_api_tests/scripts/mining_stop.sh | 2 +- tests/libwallet_api_tests/scripts/open_wallet_1.sh | 2 +- tests/libwallet_api_tests/scripts/open_wallet_2.sh | 2 +- tests/libwallet_api_tests/scripts/open_wallet_3.sh | 2 +- tests/libwallet_api_tests/scripts/open_wallet_4.sh | 2 +- tests/libwallet_api_tests/scripts/open_wallet_5.sh | 2 +- tests/libwallet_api_tests/scripts/open_wallet_miner.sh | 2 +- tests/libwallet_api_tests/scripts/send_funds.sh | 2 +- translations/monero.ts | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.i18n b/README.i18n index 0c7a010e..c4eabaf1 100644 --- a/README.i18n +++ b/README.i18n @@ -25,7 +25,7 @@ To build translations after modiying them: 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: diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index f5445b48..7a4feeac 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -280,8 +280,8 @@ namespace cryptonote { 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("the blockchain anew, or use blockchain_export and blockchain_import to convert your"); - LOG_PRINT_RED_L0("existing blockchain.bin to the new format. See README.md for instructions."); + LOG_PRINT_RED_L0("the blockchain anew, or use monero-blockchain-import and monero-blockchain-export to"); + LOG_PRINT_RED_L0("convert your existing blockchain.bin to the new format. See README.md for instructions."); return false; } } diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index 81d96d5b..f16dad28 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -706,7 +706,7 @@ namespace cryptonote if(m_synchronized.compare_exchange_strong(val_expected, true)) { 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 << "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 diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index fba3e539..f10a5a3a 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -923,10 +923,10 @@ bool t_rpc_command_executor::print_status() bool daemon_is_alive = m_rpc_client->check_connection(); if(daemon_is_alive) { - tools::success_msg_writer() << "bitmonerod is running"; + tools::success_msg_writer() << "monerod is running"; } else { - tools::fail_msg_writer() << "bitmonerod is NOT running"; + tools::fail_msg_writer() << "monerod is NOT running"; } return true; diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index c1b0a2a9..421d1f53 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -1598,7 +1598,7 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string tr("Your wallet has been generated!\n" "To start synchronizing with the daemon, use \"refresh\" command.\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" "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; } // 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. } 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)) { success_msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")"; - success_msg_writer() << sw::tr("Usage:") << " simplewallet [--wallet-file=|--generate-new-wallet=] [--daemon-address=:] []"; + success_msg_writer() << sw::tr("Usage:") << " monero-wallet-cli [--wallet-file=|--generate-new-wallet=] [--daemon-address=:] []"; success_msg_writer() << desc_all; return false; } @@ -3798,8 +3798,8 @@ int main(int argc, char* argv[]) return 0; // log_file_path - // default: < argv[0] directory >/simplewallet.log - // so if ran as "simplewallet" (no path), log file will be in cwd + // default: < argv[0] directory >/monero-wallet-cli.log + // so if ran as "monero-wallet-cli" (no path), log file will be in cwd // // if log-file argument given: // absolute path diff --git a/tests/libwallet_api_tests/scripts/create_wallets.sh b/tests/libwallet_api_tests/scripts/create_wallets.sh index 6abad84f..e25d2c31 100755 --- a/tests/libwallet_api_tests/scripts/create_wallets.sh +++ b/tests/libwallet_api_tests/scripts/create_wallets.sh @@ -2,7 +2,7 @@ function create_wallet { 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 } diff --git a/tests/libwallet_api_tests/scripts/mining_start.sh b/tests/libwallet_api_tests/scripts/mining_start.sh index 76eabfc5..30e3b7fb 100755 --- a/tests/libwallet_api_tests/scripts/mining_start.sh +++ b/tests/libwallet_api_tests/scripts/mining_start.sh @@ -1,4 +1,4 @@ #!/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 diff --git a/tests/libwallet_api_tests/scripts/mining_stop.sh b/tests/libwallet_api_tests/scripts/mining_stop.sh index 640e5694..fadd6808 100755 --- a/tests/libwallet_api_tests/scripts/mining_stop.sh +++ b/tests/libwallet_api_tests/scripts/mining_stop.sh @@ -1,4 +1,4 @@ #!/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 diff --git a/tests/libwallet_api_tests/scripts/open_wallet_1.sh b/tests/libwallet_api_tests/scripts/open_wallet_1.sh index 08f4e28a..6e5a373d 100755 --- a/tests/libwallet_api_tests/scripts/open_wallet_1.sh +++ b/tests/libwallet_api_tests/scripts/open_wallet_1.sh @@ -1,5 +1,5 @@ #!/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 diff --git a/tests/libwallet_api_tests/scripts/open_wallet_2.sh b/tests/libwallet_api_tests/scripts/open_wallet_2.sh index 8a16a664..305af2f1 100755 --- a/tests/libwallet_api_tests/scripts/open_wallet_2.sh +++ b/tests/libwallet_api_tests/scripts/open_wallet_2.sh @@ -1,5 +1,5 @@ #!/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 diff --git a/tests/libwallet_api_tests/scripts/open_wallet_3.sh b/tests/libwallet_api_tests/scripts/open_wallet_3.sh index 64a04b3c..43df4a90 100755 --- a/tests/libwallet_api_tests/scripts/open_wallet_3.sh +++ b/tests/libwallet_api_tests/scripts/open_wallet_3.sh @@ -1,4 +1,4 @@ #!/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 diff --git a/tests/libwallet_api_tests/scripts/open_wallet_4.sh b/tests/libwallet_api_tests/scripts/open_wallet_4.sh index 8ebf0a4c..c48dd563 100755 --- a/tests/libwallet_api_tests/scripts/open_wallet_4.sh +++ b/tests/libwallet_api_tests/scripts/open_wallet_4.sh @@ -1,4 +1,4 @@ #!/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 diff --git a/tests/libwallet_api_tests/scripts/open_wallet_5.sh b/tests/libwallet_api_tests/scripts/open_wallet_5.sh index bbeb702c..820114d4 100755 --- a/tests/libwallet_api_tests/scripts/open_wallet_5.sh +++ b/tests/libwallet_api_tests/scripts/open_wallet_5.sh @@ -1,4 +1,4 @@ #!/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 diff --git a/tests/libwallet_api_tests/scripts/open_wallet_miner.sh b/tests/libwallet_api_tests/scripts/open_wallet_miner.sh index 07a4e58e..633e2519 100755 --- a/tests/libwallet_api_tests/scripts/open_wallet_miner.sh +++ b/tests/libwallet_api_tests/scripts/open_wallet_miner.sh @@ -1,4 +1,4 @@ #!/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 diff --git a/tests/libwallet_api_tests/scripts/send_funds.sh b/tests/libwallet_api_tests/scripts/send_funds.sh index 437e4f24..b7f282b7 100755 --- a/tests/libwallet_api_tests/scripts/send_funds.sh +++ b/tests/libwallet_api_tests/scripts/send_funds.sh @@ -6,7 +6,7 @@ function send_funds { local amount=$1 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 \ --command transfer $dest $amount } diff --git a/translations/monero.ts b/translations/monero.ts index 7909266c..e245c168 100644 --- a/translations/monero.ts +++ b/translations/monero.ts @@ -311,7 +311,7 @@ Wallet file name: Your wallet has been generated. To start synchronizing with the daemon use "refresh" command. Use "help" command to see the list of available commands. -Always use "exit" command when closing simplewallet to save +Always use "exit" command when closing monero-wallet-cli to save current session's state. Otherwise, you will possibly need to synchronize your wallet again. Your wallet key is NOT under risk anyway.