change interface of on_cashout to take comment_object and comment_cashout_object since caller needs to have access to them

Previous interface suggested you could take passed values from places other than existing chain objects.

Author: ABW

libraries/chain/database.cpp

@@ -663,8 +663,9 @@ void database::remove_old_cashouts()
   while( itr != idx.end() )
   {
     const auto& current = *itr;
+    const auto& comment = get_comment( current );
     ++itr;
-    get_comments_handler()->on_cashout( current.get_comment_id(), current.get_author_id(), current.get_permlink() );
+    get_comments_handler()->on_cashout( comment, current );
     remove( current );
   }
 }
@@ -2657,6 +2658,12 @@ void database::process_comment_cashout()
       funds[ fund_id ].hive_awarded += cashout_comment_helper( ctx, _comment, *_current,
         find_comment_cashout_ex( _comment ), forward_curation_remainder );
       ++count;
+
+      if( has_hardfork( HIVE_HARDFORK_0_19 ) )
+      {
+        get_comments_handler()->on_cashout( _comment, *_current );
+        remove( *_current );
+      }
     }
     else
     {
@@ -2685,11 +2692,6 @@ void database::process_comment_cashout()
       }
     }
 
-    if( has_hardfork( HIVE_HARDFORK_0_19 ) )
-    {
-      get_comments_handler()->on_cashout( _current->get_comment_id(), _current->get_author_id(), _current->get_permlink() );
-      remove( *_current );
-    }
     _current = cidx.begin();
   }
   if( _benchmark_dumper.is_enabled() && count )

libraries/chain/external_storage/rocksdb_storage_processor.cpp

@@ -27,31 +27,27 @@ rocksdb_storage_processor::~rocksdb_storage_processor()
 {
 }
 
-void rocksdb_storage_processor::on_cashout( const comment_id_type& comment_id, const account_id_type& account_id, const std::string& permlink )
+void rocksdb_storage_processor::on_cashout( const comment_object& _comment, const comment_cashout_object& _comment_cashout )
 {
-  auto& _account = db.get_account( account_id );
-  auto _found = db.find_comment( comment_id );
-
-  FC_ASSERT( _found, "Comment ${author}/${permlink} has to exist", ("permlink", permlink)("author", _account.get_name()) );
 
   const auto& _volatile_idx = db.get_index< volatile_comment_index, by_permlink >();
-  auto _vfound = _volatile_idx.find( _found->get_author_and_permlink_hash() );
-
-  if( _vfound != _volatile_idx.end() )
-    return;
+  FC_ASSERT( _volatile_idx.find( _comment.get_author_and_permlink_hash() ) == _volatile_idx.end(),
+    "Incorrect duplicate archiving of the same comment" ); //ABW: because volatile_comment_index is under undo, this should never happen
 
 #ifdef DBG_INFO
+  auto& _account = db.get_account( _comment_cashout.get_author_id() );
   ilog( "head: ${head} lib: ${lib} Store a comment with hash: ${hash}, with author/permlink: ${author}/${permlink}",
-  ("hash", comment_object::compute_author_and_permlink_hash( _account.get_id(), permlink ))
-  ("permlink", permlink)("author", _account.get_name())("head", db.head_block_num())("lib", db.get_last_irreversible_block_num()) );
+    ( "head", db.head_block_num() )( "lib", db.get_last_irreversible_block_num() )
+    ( "hash", _comment.get_author_and_permlink_hash() )
+    ( "author", _account.get_name() )( "permlink", _comment_cashout.get_permlink() ) );
 #endif
 
   db.create< volatile_comment_object >( [&]( volatile_comment_object& o )
   {
-    o.comment_id      = _found->get_id();
-    o.parent_comment  = _found->get_parent_id();
-    o.depth           = _found->get_depth();
-    o.set_author_and_permlink_hash( _found->get_author_and_permlink_hash() );
+    o.comment_id      = _comment.get_id();
+    o.parent_comment  = _comment.get_parent_id();
+    o.depth           = _comment.get_depth();
+    o.set_author_and_permlink_hash( _comment.get_author_and_permlink_hash() );
 
     o.block_number    = db.head_block_num();
   });

libraries/chain/include/hive/chain/external_storage/comments_handler.hpp

@@ -14,7 +14,7 @@ class comments_handler
 
     using ptr = std::shared_ptr<comments_handler>;
 
-    virtual void on_cashout( const comment_id_type& comment_id, const account_id_type& account_id, const std::string& permlink ) = 0;
+    virtual void on_cashout( const comment_object& _comment, const comment_cashout_object& _comment_cashout ) = 0;
     virtual void on_irreversible_block( uint32_t block_num ) = 0;
 
     virtual comment get_comment( const account_id_type& author, const std::string& permlink, bool comment_is_required ) const = 0;

libraries/chain/include/hive/chain/external_storage/rocksdb_storage_processor.hpp

@@ -32,7 +32,7 @@ class rocksdb_storage_processor: public external_storage_processor
     rocksdb_storage_processor( const abstract_plugin& plugin, database& db, const bfs::path& blockchain_storage_path, const bfs::path& storage_path, appbase::application& app, bool destroy_on_startup );
     virtual ~rocksdb_storage_processor();
 
-    void on_cashout( const comment_id_type& comment_id, const account_id_type& account_id, const std::string& permlink ) override;
+    void on_cashout( const comment_object& _comment, const comment_cashout_object& _comment_cashout ) override;
     void on_irreversible_block( uint32_t block_num ) override;
 
     comment get_comment( const account_id_type& author, const std::string& permlink, bool comment_is_required ) const override;