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

Replace clear_filter parameter with notify_remove_create

Browse source
This commit is contained in:
elmato 2017-02-14 21:34:08 +00:00
parent bfa600c559
commit 6f1d8b548b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libraries/app/database_api.cpp
View file

@ -58,7 +58,7 @@ class database_api_impl : public std::enable_shared_from_this<database_api_impl>
fc::variants get_objects(const vector<object_id_type>& ids)const; fc::variants get_objects(const vector<object_id_type>& ids)const;
// Subscriptions // Subscriptions
void set_subscribe_callback( std::function<void(const variant&)> cb, bool clear_filter ); void set_subscribe_callback( std::function<void(const variant&)> cb, bool notify_remove_create );
void set_pending_transaction_callback( std::function<void(const variant&)> cb ); void set_pending_transaction_callback( std::function<void(const variant&)> cb );
void set_block_applied_callback( std::function<void(const variant& block_id)> cb ); void set_block_applied_callback( std::function<void(const variant& block_id)> cb );
void cancel_all_subscriptions(); void cancel_all_subscriptions();
@ -190,7 +190,8 @@ class database_api_impl : public std::enable_shared_from_this<database_api_impl>
void on_objects_removed(const vector<const object*>& objs); void on_objects_removed(const vector<const object*>& objs);
void on_applied_block(); void on_applied_block();
mutable fc::bloom_filter _subscribe_filter; bool _notify_remove_create = false;
mutable fc::bloom_filter _subscribe_filter;
std::function<void(const fc::variant&)> _subscribe_callback; std::function<void(const fc::variant&)> _subscribe_callback;
std::function<void(const fc::variant&)> _pending_trx_callback; std::function<void(const fc::variant&)> _pending_trx_callback;
std::function<void(const fc::variant&)> _block_applied_callback; std::function<void(const fc::variant&)> _block_applied_callback;
@ -281,15 +282,16 @@ fc::variants database_api_impl::get_objects(const vector<object_id_type>& ids)co
// // // //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
void database_api::set_subscribe_callback( std::function<void(const variant&)> cb, bool clear_filter ) void database_api::set_subscribe_callback( std::function<void(const variant&)> cb, bool notify_remove_create )
{ {
my->set_subscribe_callback( cb, clear_filter ); my->set_subscribe_callback( cb, notify_remove_create );
} }
void database_api_impl::set_subscribe_callback( std::function<void(const variant&)> cb, bool clear_filter ) void database_api_impl::set_subscribe_callback( std::function<void(const variant&)> cb, bool notify_remove_create )
{ {
edump((clear_filter)); //edump((clear_filter));
_subscribe_callback = cb; _subscribe_callback = cb;
_notify_remove_create = notify_remove_create;
static fc::bloom_parameters param; static fc::bloom_parameters param;
param.projected_element_count = 10000; param.projected_element_count = 10000;
@ -589,7 +591,6 @@ std::map<std::string, full_account> database_api_impl::get_full_accounts( const
if( subscribe ) if( subscribe )
{ {
ilog( "subscribe to ${id}", ("id",account->name) );
subscribe_to_item( account->id ); subscribe_to_item( account->id );
} }