Redesigned last added function declaration. #161

GolosChain · Aug 28, 2017 · bd0b507 · bd0b507
1 parent d8d1273
commit bd0b507
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/include/fc/rpc/cli.hpp b/include/fc/rpc/cli.hpp
@@ -8,7 +8,7 @@
 
 #include <iostream>
 
-// typedef std::map<string,std::function<string(variant,const variants&)> >::iterator formatters_iterator;
+using formatters_iterator = std::map<std::string,std::function<std::string(fc::variant,const fc::variants&)> >::iterator;
 
 namespace fc { namespace rpc {
 
@@ -32,10 +32,9 @@ namespace fc { namespace rpc {
          virtual void getline( const fc::string& prompt, fc::string& line );
 
          void set_prompt( const string& prompt );
-         // formatters_iterator get_result_formatters_end();
-         // formatters_iterator find_method( const std::string& method );
-         std::map<string,std::function<string(variant,const variants&)> >::iterator get_result_formatters_end();
-         std::map<string,std::function<string(variant,const variants&)> >::iterator find_method( const std::string& method );
+
+         formatters_iterator get_result_formatters_end();
+         formatters_iterator find_method( const std::string& method );
 
       private:
          void run();

diff --git a/src/rpc/cli.cpp b/src/rpc/cli.cpp
@@ -86,13 +86,11 @@ void cli::set_prompt( const string& prompt )
    _prompt = prompt;
 }
 
-// formatters_iterator cli::get_result_formatters_end() {
-std::map<string,std::function<string(variant,const variants&)> >::iterator cli::get_result_formatters_end() {
+formatters_iterator cli::get_result_formatters_end() {
    return _result_formatters.end();
 }
 
-// formatters_iterator cli::find_method( const std::string& method ) {
-std::map<string,std::function<string(variant,const variants&)> >::iterator cli::find_method( const std::string& method ) {
+formatters_iterator cli::find_method( const std::string& method ) {
    return _result_formatters.find( method );
 }