Encapsulate recurrent_transfer_extension_visitor

Author: Mariusz-Trela

libraries/chain/hive_evaluator.cpp

@@ -3315,12 +3315,10 @@ void recurrent_transfer_evaluator::do_apply( const recurrent_transfer_operation&
   asset available = _db.get_balance( from_account, op.amount.symbol );
   FC_ASSERT( available >= op.amount, "Account does not have enough tokens for the first transfer, has ${has} needs ${needs}", ("has",  available)("needs", op.amount) );
 
-  recurrent_transfer_operation::recurrent_transfer_extension_visitor vtor;
-  for( const auto& e : op.extensions )
-    e.visit( vtor );
-  uint8_t rtp_id = vtor.pair_id;
+  bool was_pair_id = false;
+  uint8_t rtp_id = op.get_pair_id( &was_pair_id );
 
-  FC_ASSERT( !vtor.was_pair_id || ( vtor.was_pair_id && _db.has_hardfork( HIVE_HARDFORK_1_28 ) ),
+  FC_ASSERT( !was_pair_id || ( was_pair_id && _db.has_hardfork( HIVE_HARDFORK_1_28 ) ),
     "recurrent_transfer_pair_id extension requires hardfork ${hf}", ( "hf", HIVE_HARDFORK_1_28 ) );
 
   const auto& rt_idx = _db.get_index< recurrent_transfer_index, by_from_to_id >();

libraries/protocol/include/hive/protocol/hive_operations.hpp

@@ -1075,40 +1075,62 @@ namespace hive { namespace protocol {
     */
   struct recurrent_transfer_operation : public base_operation
   {
-    struct recurrent_transfer_extension_visitor
-    {
-      uint8_t pair_id = 0; // default recurrent transfer id is 0
-      bool was_pair_id = false;
+    private:
+      struct recurrent_transfer_extension_visitor
+      {
+        uint8_t pair_id = 0; // default recurrent transfer id is 0
+        bool was_pair_id = false;
 
-      typedef void result_type;
+        typedef void result_type;
 
-      void operator()( const recurrent_transfer_pair_id& recurrent_transfer_pair_id )
-      {
-        was_pair_id = true;
-        pair_id = recurrent_transfer_pair_id.pair_id;
-      }
+        void operator()( const recurrent_transfer_pair_id& recurrent_transfer_pair_id )
+        {
+          was_pair_id = true;
+          pair_id = recurrent_transfer_pair_id.pair_id;
+        }
 
-      void operator()( const hive::void_t& ) {}
-    };
+        void operator()( const hive::void_t& ) {}
+      };
 
-    account_name_type from;
-    /// Account to transfer asset to
-    account_name_type to;
-    /// The amount of asset to transfer from @ref from to @ref to
-    asset             amount;
+    public:
 
-    string            memo;
-    /// How often will the payment be triggered, unit: hours
-    uint16_t          recurrence = 0;
+      account_name_type from;
+      /// Account to transfer asset to
+      account_name_type to;
+      /// The amount of asset to transfer from @ref from to @ref to
+      asset             amount;
 
-    // How many times the recurrent payment will be executed
-    uint16_t          executions = 0;
+      string            memo;
+      /// How often will the payment be triggered, unit: hours
+      uint16_t          recurrence = 0;
 
-    /// Extensions, only recurrent_transfer_pair_id is supported so far
-    recurrent_transfer_extensions_type   extensions;
+      // How many times the recurrent payment will be executed
+      uint16_t          executions = 0;
 
-    void              validate()const;
-    void get_required_active_authorities( flat_set<account_name_type>& a )const{ a.insert(from); }
+      /// Extensions, only recurrent_transfer_pair_id is supported so far
+      recurrent_transfer_extensions_type   extensions;
+
+      void              validate()const;
+      void get_required_active_authorities( flat_set<account_name_type>& a )const{ a.insert(from); }
+
+      /// Returns pair id specific to given operation. explicitValue if not null will be set to true if pair_id was explicitly specified in the operation.
+      uint8_t get_pair_id( const recurrent_transfer_extensions_type& _extensions, bool* explicitValue = nullptr ) const
+      {
+        recurrent_transfer_extension_visitor _vtor;
+
+        for( const auto& e : _extensions )
+          e.visit( _vtor );
+
+        if( explicitValue )
+          *explicitValue = _vtor.was_pair_id;
+
+        return _vtor.pair_id;
+      }
+
+      uint8_t get_pair_id( bool* explicitValue = nullptr ) const
+      {
+        return get_pair_id( extensions, explicitValue );
+      }
   };
 
   struct witness_block_approve_operation : public base_operation

tests/unit/tests/operation_tests.cpp

@@ -10320,10 +10320,7 @@ BOOST_AUTO_TEST_CASE( extensions_in_virtual_operations_generated_after_recurrent
       auto _recent_ops = get_last_operations( 1 );
       auto _last_op = _recent_ops.back().get< fill_recurrent_transfer_operation >();
 
-      recurrent_transfer_operation::recurrent_transfer_extension_visitor _vtor;
-      for( const auto& e : _last_op.extensions )
-        e.visit( _vtor );
-      BOOST_REQUIRE( _vtor.pair_id == _pair_id_value );
+      BOOST_REQUIRE( op.get_pair_id( _last_op.extensions ) == _pair_id_value );
     }
 
     generate_blocks( db->head_block_time() + fc::hours( op.recurrence ) );
@@ -10332,10 +10329,7 @@ BOOST_AUTO_TEST_CASE( extensions_in_virtual_operations_generated_after_recurrent
       auto _recent_ops = get_last_operations( 1 );
       auto _last_op = _recent_ops.back().get< failed_recurrent_transfer_operation >();
 
-      recurrent_transfer_operation::recurrent_transfer_extension_visitor _vtor;
-      for( const auto& e : _last_op.extensions )
-        e.visit( _vtor );
-      BOOST_REQUIRE( _vtor.pair_id == _pair_id_value );
+      BOOST_REQUIRE( op.get_pair_id( _last_op.extensions ) == _pair_id_value );
     }
   }
   FC_LOG_AND_RETHROW()