Merge pull request #3049 from steemit/3029-delete-bandwidth

Delete bandwidth

libraries/plugins/apis/condenser_api/CMakeLists.txt

@@ -17,7 +17,6 @@ target_link_libraries( condenser_api_plugin
    market_history_api_plugin
    network_broadcast_api_plugin
    tags_api_plugin
-   witness_api_plugin
    steem_utilities )
 target_include_directories( condenser_api_plugin PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
 

libraries/plugins/apis/condenser_api/condenser_api.cpp

@@ -10,7 +10,6 @@
 #include <steem/plugins/follow_api/follow_api_plugin.hpp>
 #include <steem/plugins/reputation_api/reputation_api_plugin.hpp>
 #include <steem/plugins/market_history_api/market_history_api_plugin.hpp>
-#include <steem/plugins/witness_api/witness_api_plugin.hpp>
 
 #include <steem/utilities/git_revision.hpp>
 
@@ -74,7 +73,6 @@ namespace detail
             (get_recovery_request)
             (get_escrow)
             (get_withdraw_routes)
-            (get_account_bandwidth)
             (get_savings_withdraw_from)
             (get_savings_withdraw_to)
             (get_vesting_delegations)
@@ -155,7 +153,6 @@ namespace detail
          std::shared_ptr< follow::follow_api >                             _follow_api;
          std::shared_ptr< reputation::reputation_api >                     _reputation_api;
          std::shared_ptr< market_history::market_history_api >             _market_history_api;
-         std::shared_ptr< witness::witness_api >                           _witness_api;
 
          map< transaction_id_type, confirmation_callback >                 _callbacks;
          map< time_point_sec, vector< transaction_id_type > >              _callback_expirations;
@@ -785,13 +782,6 @@ namespace detail
    {
       CHECK_ARG_SIZE( 0 )
       get_dynamic_global_properties_return gpo = _database_api->get_dynamic_global_properties( {} );
-      if( _witness_api )
-      {
-         auto reserve_ratio = _witness_api->get_reserve_ratio( {} );
-         gpo.average_block_size = reserve_ratio.average_block_size;
-         gpo.current_reserve_ratio = reserve_ratio.current_reserve_ratio;
-         gpo.max_virtual_bandwidth = reserve_ratio.max_virtual_bandwidth;
-      }
 
       return gpo;
    }
@@ -881,26 +871,6 @@ namespace detail
                results.back().reputation = _reputation_api->get_account_reputations( { itr->name, 1 } ).reputations[0].reputation;
             }
 
-            if( _witness_api )
-            {
-               auto& e_acct = results.back();
-               auto forum_bandwidth = _witness_api->get_account_bandwidth( { itr->name, witness::bandwidth_type::forum } );
-               if( forum_bandwidth.bandwidth.valid() )
-               {
-                  e_acct.average_bandwidth = forum_bandwidth.bandwidth->average_bandwidth;
-                  e_acct.lifetime_bandwidth = forum_bandwidth.bandwidth->lifetime_bandwidth;
-                  e_acct.last_bandwidth_update = forum_bandwidth.bandwidth->last_bandwidth_update;
-               }
-
-               auto market_bandwidth = _witness_api->get_account_bandwidth( { itr->name, witness::bandwidth_type::market } );
-               if( market_bandwidth.bandwidth.valid() )
-               {
-                  e_acct.average_market_bandwidth = market_bandwidth.bandwidth->average_bandwidth;
-                  e_acct.lifetime_market_bandwidth = market_bandwidth.bandwidth->lifetime_bandwidth;
-                  e_acct.last_market_bandwidth_update = market_bandwidth.bandwidth->last_bandwidth_update;
-               }
-            }
-
             auto vitr = vidx.lower_bound( boost::make_tuple( itr->name, account_name_type() ) );
             while( vitr != vidx.end() && vitr->account == itr->name ) {
                results.back().witness_votes.insert( _db.get< witness_object, by_name >( vitr->witness ).owner );
@@ -1028,17 +998,6 @@ namespace detail
       return result;
    }
 
-   DEFINE_API_IMPL( condenser_api_impl, get_account_bandwidth )
-   {
-      CHECK_ARG_SIZE( 2 )
-      FC_ASSERT( _witness_api, "witness_api_plugin not enabled." );
-      return _witness_api->get_account_bandwidth(
-         {
-            args[0].as< string >(),
-            args[1].as< witness::bandwidth_type >()
-         }).bandwidth;
-   }
-
    DEFINE_API_IMPL( condenser_api_impl, get_savings_withdraw_from )
    {
       CHECK_ARG_SIZE( 1 )
@@ -2202,12 +2161,6 @@ void condenser_api::api_startup()
    {
       my->_market_history_api = market_history->api;
    }
-
-   auto witness = appbase::app().find_plugin< witness::witness_api_plugin >();
-   if( witness != nullptr )
-   {
-      my->_witness_api = witness->api;
-   }
 }
 
 DEFINE_LOCKLESS_APIS( condenser_api,
@@ -2244,7 +2197,6 @@ DEFINE_READ_APIS( condenser_api,
    (get_recovery_request)
    (get_escrow)
    (get_withdraw_routes)
-   (get_account_bandwidth)
    (get_savings_withdraw_from)
    (get_savings_withdraw_to)
    (get_vesting_delegations)

libraries/plugins/apis/condenser_api/include/steem/plugins/condenser_api/condenser_api.hpp

@@ -9,7 +9,6 @@
 #include <steem/plugins/follow_api/follow_api.hpp>
 #include <steem/plugins/reputation_api/reputation_api.hpp>
 #include <steem/plugins/market_history_api/market_history_api.hpp>
-#include <steem/plugins/witness_api/witness_api.hpp>
 
 #include <steem/plugins/condenser_api/condenser_api_legacy_objects.hpp>
 
@@ -233,13 +232,6 @@ struct extended_account : public api_account_object
    extended_account( const database_api::api_account_object& a ) :
       api_account_object( a ) {}
 
-   share_type                                               average_bandwidth;
-   share_type                                               lifetime_bandwidth;
-   time_point_sec                                           last_bandwidth_update;
-   share_type                                               average_market_bandwidth;
-   share_type                                               lifetime_market_bandwidth;
-   time_point_sec                                           last_market_bandwidth_update;
-
    legacy_asset                                             vesting_balance;  /// convert vesting_shares to vesting steem
    share_type                                               reputation = 0;
    map< uint64_t, api_operation_object >   transfer_history; /// transfer to/from vesting
@@ -425,10 +417,6 @@ struct extended_dynamic_global_properties
 
    uint16_t          sbd_stop_percent = 0;
    uint16_t          sbd_start_percent = 0;
-
-   int32_t           average_block_size = 0;
-   int64_t           current_reserve_ratio = 1;
-   uint128_t         max_virtual_bandwidth = 0;
 };
 
 struct api_witness_object
@@ -969,7 +957,6 @@ DEFINE_API_ARGS( get_owner_history,                      vector< variant >,   ve
 DEFINE_API_ARGS( get_recovery_request,                   vector< variant >,   optional< database_api::api_account_recovery_request_object > )
 DEFINE_API_ARGS( get_escrow,                             vector< variant >,   optional< api_escrow_object > )
 DEFINE_API_ARGS( get_withdraw_routes,                    vector< variant >,   vector< database_api::api_withdraw_vesting_route_object > )
-DEFINE_API_ARGS( get_account_bandwidth,                  vector< variant >,   optional< witness::api_account_bandwidth_object > )
 DEFINE_API_ARGS( get_savings_withdraw_from,              vector< variant >,   vector< api_savings_withdraw_object > )
 DEFINE_API_ARGS( get_savings_withdraw_to,                vector< variant >,   vector< api_savings_withdraw_object > )
 DEFINE_API_ARGS( get_vesting_delegations,                vector< variant >,   vector< api_vesting_delegation_object > )
@@ -1063,7 +1050,6 @@ class condenser_api
       (get_recovery_request)
       (get_escrow)
       (get_withdraw_routes)
-      (get_account_bandwidth)
       (get_savings_withdraw_from)
       (get_savings_withdraw_to)
       (get_vesting_delegations)
@@ -1167,7 +1153,6 @@ FC_REFLECT( steem::plugins::condenser_api::api_account_object,
           )
 
 FC_REFLECT_DERIVED( steem::plugins::condenser_api::extended_account, (steem::plugins::condenser_api::api_account_object),
-            (average_bandwidth)(lifetime_bandwidth)(last_bandwidth_update)(average_market_bandwidth)(lifetime_market_bandwidth)(last_market_bandwidth_update)
             (vesting_balance)(reputation)(transfer_history)(market_history)(post_history)(vote_history)(other_history)(witness_votes)(tags_usage)(guest_bloggers)(open_orders)(comments)(feed)(blog)(recent_replies)(recommended) )
 
 FC_REFLECT( steem::plugins::condenser_api::api_comment_object,
@@ -1191,8 +1176,7 @@ FC_REFLECT( steem::plugins::condenser_api::extended_dynamic_global_properties,
             (total_reward_fund_steem)(total_reward_shares2)(pending_rewarded_vesting_shares)(pending_rewarded_vesting_steem)
             (sbd_interest_rate)(sbd_print_rate)
             (maximum_block_size)(current_aslot)(recent_slots_filled)(participation_count)(last_irreversible_block_num)(vote_power_reserve_rate)
-            (delegation_return_period)(reverse_auction_seconds)(sbd_stop_percent)(sbd_start_percent)
-            (average_block_size)(current_reserve_ratio)(max_virtual_bandwidth) )
+            (delegation_return_period)(reverse_auction_seconds)(sbd_stop_percent)(sbd_start_percent) )
 
 FC_REFLECT( steem::plugins::condenser_api::api_witness_object,
              (id)

libraries/plugins/witness/CMakeLists.txt

@@ -5,7 +5,7 @@ add_library( witness_plugin
              ${HEADERS}
            )
 
-target_link_libraries( witness_plugin p2p_plugin chain_plugin rc_plugin block_data_export_plugin appbase steem_chain steem_utilities steem_utilities )
+target_link_libraries( witness_plugin p2p_plugin chain_plugin rc_plugin appbase steem_chain steem_utilities steem_utilities )
 target_include_directories( witness_plugin
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )