Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add quit command to cli_wallet #1050 #1104

Merged
merged 18 commits into from
Jul 27, 2018
Merged

add quit command to cli_wallet #1050 #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
00d5900
fixed issue #1050
nanomobile Jul 10, 2018
ed4ef38
removed non-meaningful test, wallet file isn't saving in quit() comma…
nanomobile Jul 10, 2018
aed3acf
added back cli_quit test
nanomobile Jul 17, 2018
12aeb3b
removed exit call
nanomobile Jul 18, 2018
2b79efb
merging changes from fc library
nanomobile Jul 18, 2018
f404633
changed return value in quit command
nanomobile Jul 19, 2018
e7c891d
merged changes from fc library
nanomobile Jul 19, 2018
72aa2d9
throwing fc:canceled_exception for quit cli wallet command
nanomobile Jul 20, 2018
a99cb55
merge fc
nanomobile Jul 20, 2018
a53916b
little improvements
nanomobile Jul 22, 2018
b9bcf59
fixed test for quit command
nanomobile Jul 22, 2018
96e9290
improved indentation after VSC wrong formatting
nanomobile Jul 22, 2018
206de01
fixed typo
nanomobile Jul 25, 2018
22f55b9
merged rebased fc
nanomobile Jul 25, 2018
a8a2619
bumped fc library
nanomobile Jul 25, 2018
b561c98
fixed docker build issue with @throw in cli_wallet API documentatioin
nanomobile Jul 26, 2018
997a963
removed @return comment for cli_wallet quit command
nanomobile Jul 26, 2018
af5ee4d
bump FC
nanomobile Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/fc
Open in desktop
Submodule fc updated 18 files
+6 −4 CMakeLists.txt
+3 −3 include/fc/io/fstream.hpp
+0 −5 include/fc/static_variant.hpp
+2 −2 include/fc/variant.hpp
+2 −2 src/crypto/elliptic_common.cpp
+2 −2 src/crypto/pke.cpp
+1 −1 src/filesystem.cpp
+5 −3 src/io/fstream.cpp
+2 −6 src/log/file_appender.cpp
+2 −1 src/network/http/websocket.cpp
+1 −1 src/network/tcp_socket.cpp
+5 −0 src/rpc/cli.cpp
+1 −0 src/stacktrace.cpp
+1 −0 tests/CMakeLists.txt
+72 −0 tests/logging_tests.cpp
+5 −4 tests/time_test.cpp
+1 −1 vendor/editline
+1 −1 vendor/websocketpp
7 changes: 7 additions & 0 deletions libraries/wallet/include/graphene/wallet/wallet.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,12 @@ class wallet_api
*/
bool load_wallet_file(string wallet_filename = "");

/** Quitting from BitShares wallet.
*
* The current wallet will be closed.
*/
void quit();

/** Saves the current wallet to the given filename.
*
* @warning This does not change the wallet filename that will be used for future
Expand Down Expand Up @@ -1848,4 +1854,5 @@ FC_API( graphene::wallet::wallet_api,
(blind_history)
(receive_blind_transfer)
(get_order_book)
(quit)
)
13 changes: 13 additions & 0 deletions libraries/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,14 @@ class wallet_api_impl

return true;
}

void quit()
{
ilog( "Quitting Cli Wallet ..." );

throw fc::canceled_exception();
}

void save_wallet_file(string wallet_filename = "")
{
//
Expand Down Expand Up @@ -3781,6 +3789,11 @@ bool wallet_api::load_wallet_file( string wallet_filename )
return my->load_wallet_file( wallet_filename );
}

void wallet_api::quit()
{
my->quit();
}

void wallet_api::save_wallet_file( string wallet_filename )
{
my->save_wallet_file( wallet_filename );
Expand Down
28 changes: 28 additions & 0 deletions tests/cli/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,34 @@ BOOST_AUTO_TEST_CASE( cli_connect )
app1->shutdown();
}

////////////////
// Start a server and connect using the same calls as the CLI
// Quit wallet and be sure that file was saved correctly
////////////////
BOOST_AUTO_TEST_CASE( cli_quit )
abitmore marked this conversation as resolved.
Show resolved Hide resolved
{
using namespace graphene::chain;
using namespace graphene::app;
std::shared_ptr<graphene::app::application> app1;
try {
BOOST_TEST_MESSAGE("Testing wallet connection and quit command.");

fc::temp_directory app_dir ( graphene::utilities::temp_directory_path() );

int server_port_number = 0;
app1 = start_application(app_dir, server_port_number);

// connect to the server
client_connection con(app1, app_dir, server_port_number);

BOOST_CHECK_THROW( con.wallet_api_ptr->quit(), fc::canceled_exception );
} catch( fc::exception& e ) {
edump((e.to_detail_string()));
throw;
}
app1->shutdown();
}

///////////////////////
// Start a server and connect using the same calls as the CLI
// Vote for two witnesses, and make sure they both stay there
Expand Down