From 030577f6719a483314c6de7b7e42214399704adb Mon Sep 17 00:00:00 2001
From: elmato <matias.romeo@gmail.com>
Date: Tue, 14 Feb 2017 21:41:40 +0000
Subject: [PATCH] Fix handling of events from database_object in
 debug_witness_plugin

---
 libraries/plugins/debug_witness/debug_witness.cpp    | 12 +++---------
 .../include/graphene/debug_witness/debug_witness.hpp |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/libraries/plugins/debug_witness/debug_witness.cpp b/libraries/plugins/debug_witness/debug_witness.cpp
index 751d1e82..19cf0f49 100644
--- a/libraries/plugins/debug_witness/debug_witness.cpp
+++ b/libraries/plugins/debug_witness/debug_witness.cpp
@@ -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); });
    _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;
 }
@@ -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 )
       {
          const graphene::db::object* obj = db.find_object( oid );
-         if( obj == nullptr )
-         {
-            (*_json_object_stream) << "{\"id\":" << fc::json::to_string( oid ) << "}\n";
-         }
-         else
+         if( obj != nullptr )
          {
             (*_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 )
    {
       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";
       }
    }
-   */
 }
 
 void debug_witness_plugin::on_applied_block( const graphene::chain::signed_block& b )
diff --git a/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp b/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp
index 0e5c173f..fa387891 100644
--- a/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp
+++ b/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp
@@ -51,7 +51,7 @@ public:
 private:
 
    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 );
 
    boost::program_options::variables_map _options;