fix htlc fee tests

Author: jmjatlanta

libraries/chain/include/graphene/chain/protocol/fee_schedule.hpp

@@ -113,7 +113,6 @@ namespace graphene { namespace chain {
       }
    };
 
-   /*
    template<>
    class fee_helper<htlc_create_operation> {
      public:
@@ -126,15 +125,34 @@ namespace graphene { namespace chain {
          static htlc_create_operation::fee_parameters_type htlc_create_operation_fee_dummy;
          return htlc_create_operation_fee_dummy;
       }
-      typename htlc_create_operation::fee_parameters_type& get(flat_set<fee_parameters>& parameters)const
+   };
+
+   template<>
+   class fee_helper<htlc_redeem_operation> {
+     public:
+      const htlc_redeem_operation::fee_parameters_type& cget(const flat_set<fee_parameters>& parameters)const
       {
-         auto itr = parameters.find( htlc_create_operation::fee_parameters_type() );
-         FC_ASSERT( itr != parameters.end() );
-         return itr->get<htlc_create_operation::fee_parameters_type>();
+         auto itr = parameters.find( htlc_redeem_operation::fee_parameters_type() );
+         if ( itr != parameters.end() )
+            return itr->get<htlc_redeem_operation::fee_parameters_type>();
+
+         static htlc_redeem_operation::fee_parameters_type htlc_redeem_operation_fee_dummy;
+         return htlc_redeem_operation_fee_dummy;
       }
    };
-   */
+   template<>
+   class fee_helper<htlc_extend_operation> {
+     public:
+      const htlc_extend_operation::fee_parameters_type& cget(const flat_set<fee_parameters>& parameters)const
+      {
+         auto itr = parameters.find( htlc_extend_operation::fee_parameters_type() );
+         if ( itr != parameters.end() )
+            return itr->get<htlc_extend_operation::fee_parameters_type>();
 
+         static htlc_extend_operation::fee_parameters_type htlc_extend_operation_fee_dummy;
+         return htlc_extend_operation_fee_dummy;
+      }
+   };
    /**
     *  @brief contains all of the parameters necessary to calculate the fee for any operation
     */
@@ -168,6 +186,12 @@ namespace graphene { namespace chain {
       {
          return fee_helper<Operation>().get(parameters);
       }
+      template<typename Operation>
+      const bool exists()const
+      {
+         auto itr = parameters.find(typename Operation::fee_parameters_type());
+         return itr != parameters.end();
+      }
 
       /**
        *  @note must be sorted by fee_parameters.which() and have no duplicates

libraries/chain/proposal_evaluator.cpp

@@ -97,7 +97,9 @@ struct proposal_operation_hardfork_visitor
    void operator()(const graphene::chain::committee_member_update_global_parameters_operation &op) const {
       if (block_time < HARDFORK_CORE_1468_TIME) {
          FC_ASSERT(!op.new_parameters.extensions.value.updatable_htlc_options.valid(), "Unable to set HTLC options before hardfork 1468");
-         // TODO: Do not allow changing of fees before hardfork
+         FC_ASSERT(!op.new_parameters.current_fees->exists<htlc_create_operation>());
+         FC_ASSERT(!op.new_parameters.current_fees->exists<htlc_redeem_operation>());
+         FC_ASSERT(!op.new_parameters.current_fees->exists<htlc_extend_operation>());
       }
    }
    // loop and self visit in proposals