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

Fix handling of events from database_object in debug_witness_plugin

Browse source
This commit is contained in:
elmato 2017-02-14 21:41:40 +00:00
parent 31f322c9cd
commit 030577f671
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/plugins/debug_witness/debug_witness.cpp
View file

@ -99,7 +99,7 @@ void debug_witness_plugin::plugin_startup()
_applied_block_conn = db.applied_block.connect([this](const graphene::chain::signed_block& b){ on_applied_block(b); }); _applied_block_conn = db.applied_block.connect([this](const graphene::chain::signed_block& b){ on_applied_block(b); });
_changed_objects_conn = db.changed_objects.connect([this](const std::vector<graphene::db::object_id_type>& ids){ on_changed_objects(ids); }); _changed_objects_conn = db.changed_objects.connect([this](const std::vector<graphene::db::object_id_type>& ids){ on_changed_objects(ids); });
_removed_objects_conn = db.removed_objects.connect([this](const std::vector<const graphene::db::object*>& objs){ on_removed_objects(objs); }); _removed_objects_conn = db.removed_objects.connect([this](const std::vector<graphene::db::object_id_type>& ids, const std::vector<const graphene::db::object*>& objs){ on_removed_objects(ids, objs); });
return; return;
} }
@ -112,11 +112,7 @@ void debug_witness_plugin::on_changed_objects( const std::vector<graphene::db::o
for( const graphene::db::object_id_type& oid : ids ) for( const graphene::db::object_id_type& oid : ids )
{ {
const graphene::db::object* obj = db.find_object( oid ); const graphene::db::object* obj = db.find_object( oid );
if( obj == nullptr ) if( obj != nullptr )
{
(*_json_object_stream) << "{\"id\":" << fc::json::to_string( oid ) << "}\n";
}
else
{ {
(*_json_object_stream) << fc::json::to_string( obj->to_variant() ) << '\n'; (*_json_object_stream) << fc::json::to_string( obj->to_variant() ) << '\n';
} }
@ -124,9 +120,8 @@ void debug_witness_plugin::on_changed_objects( const std::vector<graphene::db::o
} }
} }
void debug_witness_plugin::on_removed_objects( const std::vector<const graphene::db::object*> objs ) void debug_witness_plugin::on_removed_objects( const std::vector<graphene::db::object_id_type>& ids, const std::vector<const graphene::db::object*> objs )
{ {
/*
if( _json_object_stream ) if( _json_object_stream )
{ {
for( const graphene::db::object* obj : objs ) for( const graphene::db::object* obj : objs )
@ -134,7 +129,6 @@ void debug_witness_plugin::on_removed_objects( const std::vector<const graphene:
(*_json_object_stream) << "{\"id\":" << fc::json::to_string( obj->id ) << "}\n"; (*_json_object_stream) << "{\"id\":" << fc::json::to_string( obj->id ) << "}\n";
} }
} }
*/
} }
void debug_witness_plugin::on_applied_block( const graphene::chain::signed_block& b ) void debug_witness_plugin::on_applied_block( const graphene::chain::signed_block& b )

2
libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp
View file

@ -51,7 +51,7 @@ public:
private: private:
void on_changed_objects( const std::vector<graphene::db::object_id_type>& ids ); void on_changed_objects( const std::vector<graphene::db::object_id_type>& ids );
void on_removed_objects( const std::vector<const graphene::db::object*> objs ); void on_removed_objects( const std::vector<graphene::db::object_id_type>& ids, const std::vector<const graphene::db::object*> objs );
void on_applied_block( const graphene::chain::signed_block& b ); void on_applied_block( const graphene::chain::signed_block& b );
boost::program_options::variables_map _options; boost::program_options::variables_map _options;