Merge pull request #2452 from steemit/2451-remote-node-api-boilerplat…

…e-fix cli_wallet: Fix remote_node_api and related boilerplate #2451
steemit · May 14, 2018 · 9748f5c · 9748f5c
2 parents b0e8fc1 + 3100130
commit 9748f5c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/libraries/wallet/include/steem/wallet/remote_node_api.hpp b/libraries/wallet/include/steem/wallet/remote_node_api.hpp
@@ -30,7 +30,7 @@ struct remote_node_api
    vector< condenser_api::api_operation_object > get_ops_in_block( uint32_t, bool only_virtual = true );
    fc::variant_object get_config();
    condenser_api::extended_dynamic_global_properties get_dynamic_global_properties();
-   chain_properties get_chain_properties();
+   condenser_api::api_chain_properties get_chain_properties();
    condenser_api::legacy_price get_current_median_history_price();
    condenser_api::api_feed_history_object get_feed_history();
    condenser_api::api_witness_schedule_object get_witness_schedule();
@@ -59,11 +59,11 @@ struct remote_node_api
    vector< account_name_type > lookup_witness_accounts( string, uint32_t );
    uint64_t get_witness_count();
    vector< condenser_api::api_limit_order_object > get_open_orders( account_name_type );
-   string get_transaction_hex( signed_transaction );
-   annotated_signed_transaction get_transaction( transaction_id_type );
-   set< public_key_type > get_required_signatures( signed_transaction, flat_set< public_key_type > );
-   set< public_key_type > get_potential_signatures( signed_transaction );
-   bool verify_authority( signed_transaction );
+   string get_transaction_hex( condenser_api::legacy_signed_transaction );
+   condenser_api::legacy_signed_transaction get_transaction( transaction_id_type );
+   set< public_key_type > get_required_signatures( condenser_api::legacy_signed_transaction, flat_set< public_key_type > );
+   set< public_key_type > get_potential_signatures( condenser_api::legacy_signed_transaction );
+   bool verify_authority( condenser_api::legacy_signed_transaction );
    bool verify_account_authority( string, flat_set< public_key_type > );
    vector< tags::vote_state > get_active_votes( account_name_type, string );
    vector< condenser_api::account_vote > get_account_votes( account_name_type );

diff --git a/libraries/wallet/include/steem/wallet/wallet.hpp b/libraries/wallet/include/steem/wallet/wallet.hpp
@@ -206,7 +206,7 @@ class wallet_api
       /**
        * Returns transaction by ID.
        */
-      annotated_signed_transaction get_transaction( transaction_id_type trx_id )const;
+      condenser_api::legacy_signed_transaction get_transaction( transaction_id_type trx_id )const;
 
       /** Checks whether the wallet has just been created and has not yet had a password set.
        *

diff --git a/libraries/wallet/remote_node_api.cpp b/libraries/wallet/remote_node_api.cpp
@@ -49,7 +49,7 @@ condenser_api::extended_dynamic_global_properties remote_node_api::get_dynamic_g
    FC_ASSERT( false );
 }
 
-chain_properties remote_node_api::get_chain_properties()
+condenser_api::api_chain_properties remote_node_api::get_chain_properties()
 {
    FC_ASSERT( false );
 }
@@ -194,27 +194,27 @@ vector< condenser_api::api_limit_order_object > remote_node_api::get_open_orders
    FC_ASSERT( false );
 }
 
-string remote_node_api::get_transaction_hex( signed_transaction )
+string remote_node_api::get_transaction_hex( condenser_api::legacy_signed_transaction )
 {
    FC_ASSERT( false );
 }
 
-annotated_signed_transaction remote_node_api::get_transaction( transaction_id_type )
+condenser_api::legacy_signed_transaction remote_node_api::get_transaction( transaction_id_type )
 {
    FC_ASSERT( false );
 }
 
-set< public_key_type > remote_node_api::get_required_signatures( signed_transaction, flat_set< public_key_type > )
+set< public_key_type > remote_node_api::get_required_signatures( condenser_api::legacy_signed_transaction, flat_set< public_key_type > )
 {
    FC_ASSERT( false );
 }
 
-set< public_key_type > remote_node_api::get_potential_signatures( signed_transaction )
+set< public_key_type > remote_node_api::get_potential_signatures( condenser_api::legacy_signed_transaction )
 {
    FC_ASSERT( false );
 }
 
-bool remote_node_api::verify_authority( signed_transaction )
+bool remote_node_api::verify_authority( condenser_api::legacy_signed_transaction )
 {
    FC_ASSERT( false );
 }

diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -2195,7 +2195,7 @@ void wallet_api::set_transaction_expiration(uint32_t seconds)
    my->set_transaction_expiration(seconds);
 }
 
-annotated_signed_transaction wallet_api::get_transaction( transaction_id_type id )const {
+condenser_api::legacy_signed_transaction wallet_api::get_transaction( transaction_id_type id )const {
    return my->_remote_api->get_transaction( id );
 }