Merge pull request #623 from steemit/620-api-get-active-witnesses

Fix return type of get_active_witnesses()
steemit · Nov 28, 2016 · b8a0337 · b8a0337
2 parents 5b8f699 + 0c9da97
commit b8a0337
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp
@@ -1495,9 +1495,14 @@ vector<account_name_type> database_api::get_miner_queue()const {
    return result;
 }
 
-fc::array< account_name_type, STEEMIT_MAX_WITNESSES > database_api::get_active_witnesses()const {
+vector< account_name_type > database_api::get_active_witnesses()const
+{
    const auto& wso = my->_db.get_witness_schedule_object();
-   return wso.current_shuffled_witnesses;
+   size_t n = wso.current_shuffled_witnesses.size();
+   vector< account_name_type > result(n);
+   for( size_t i=0; i<n; i++ )
+      result.push_back( wso.current_shuffled_witnesses[i] );
+   return result;
 }
 
 vector<discussion>  database_api::get_discussions_by_author_before_date(

diff --git a/libraries/app/include/steemit/app/database_api.hpp b/libraries/app/include/steemit/app/database_api.hpp
@@ -133,7 +133,7 @@ class database_api
       vector<category_api_obj> get_active_categories( string after, uint32_t limit )const;
       vector<category_api_obj> get_recent_categories( string after, uint32_t limit )const;
 
-      fc::array< account_name_type, STEEMIT_MAX_WITNESSES > get_active_witnesses()const;
+      vector< account_name_type > get_active_witnesses()const;
       vector< account_name_type > get_miner_queue()const;
 
       /////////////////////////////

diff --git a/libraries/wallet/include/steemit/wallet/wallet.hpp b/libraries/wallet/include/steemit/wallet/wallet.hpp
@@ -137,7 +137,7 @@ class wallet_api
       /**
        * Returns the list of witnesses producing blocks in the current round (21 Blocks)
        */
-      fc::array< account_name_type, STEEMIT_MAX_WITNESSES > get_active_witnesses()const;
+      vector<account_name_type>                      get_active_witnesses()const;
 
       /**
        * Returns the queue of pow miners waiting to produce blocks.

diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -1032,7 +1032,8 @@ set<string> wallet_api::list_accounts(const string& lowerbound, uint32_t limit)
 vector<account_name_type> wallet_api::get_miner_queue()const {
    return my->_remote_db->get_miner_queue();
 }
-fc::array< account_name_type, STEEMIT_MAX_WITNESSES > wallet_api::get_active_witnesses()const {
+
+std::vector< account_name_type > wallet_api::get_active_witnesses()const {
    return my->_remote_db->get_active_witnesses();
 }