Merge pull request #1104 from nanomobile/valera_issue_1050

add quit command to cli_wallet #1050
bitshares · Jul 27, 2018 · f372825 · f372825
2 parents 1608ce0 + af5ee4d
commit f372825
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 1 deletion.
diff --git a/libraries/fc b/libraries/fc
diff --git a/libraries/wallet/include/graphene/wallet/wallet.hpp b/libraries/wallet/include/graphene/wallet/wallet.hpp
@@ -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
@@ -1848,4 +1854,5 @@ FC_API( graphene::wallet::wallet_api,
         (blind_history)
         (receive_blind_transfer)
         (get_order_book)
+        (quit)
       )
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -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 = "")
    {
       //
@@ -3805,6 +3813,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 );

diff --git a/tests/cli/main.cpp b/tests/cli/main.cpp
@@ -224,6 +224,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 )
+{
+   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
+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