Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge pull request #242 from oxarbitrage/patch-3

Browse source 
Change wallet function get_market_history
This commit is contained in:
Vikram Rajkumar 2017-03-01 17:09:37 -06:00 committed by GitHub
commit 1e80d8a01e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/wallet/include/graphene/wallet/wallet.hpp
View file

@ -355,7 +355,7 @@ class wallet_api
vector<operation_detail> get_account_history(string name, int limit)const;
vector<bucket_object> get_market_history(string symbol, string symbol2, uint32_t bucket)const;
vector<bucket_object> get_market_history(string symbol, string symbol2, uint32_t bucket, fc::time_point_sec start, fc::time_point_sec end)const;
vector<limit_order_object> get_limit_orders(string a, string b, uint32_t limit)const;
vector<call_order_object> get_call_orders(string a, uint32_t limit)const;
vector<force_settlement_object> get_settle_orders(string a, uint32_t limit)const;

4
libraries/wallet/wallet.cpp
View file

@ -2819,9 +2819,9 @@ vector<operation_detail> wallet_api::get_account_history(string name, int limit)
}
vector<bucket_object> wallet_api::get_market_history( string symbol1, string symbol2, uint32_t bucket )const
vector<bucket_object> wallet_api::get_market_history( string symbol1, string symbol2, uint32_t bucket , fc::time_point_sec start, fc::time_point_sec end )const
{
return my->_remote_hist->get_market_history( get_asset_id(symbol1), get_asset_id(symbol2), bucket, fc::time_point_sec(), fc::time_point::now() );
return my->_remote_hist->get_market_history( get_asset_id(symbol1), get_asset_id(symbol2), bucket, start, end );
}
vector<limit_order_object> wallet_api::get_limit_orders(string a, string b, uint32_t limit)const