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

types.hpp: Remove parameter_extension as it breaks js_operation_serializer

Browse source
This commit is contained in:
theoreticalbts 2015-07-07 22:22:21 -04:00
parent ed38488155
commit 7bb608a305
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/chain/include/graphene/chain/types.hpp
View file

@ -441,8 +441,6 @@ namespace graphene { namespace chain {
bool is_valid_v1( const std::string& base58str ); bool is_valid_v1( const std::string& base58str );
}; };
typedef static_variant<> parameter_extension;
struct chain_parameters struct chain_parameters
{ {
fee_schedule_type current_fees; ///< current schedule of fees fee_schedule_type current_fees; ///< current schedule of fees
@ -475,7 +473,6 @@ namespace graphene { namespace chain {
share_type fee_liquidation_threshold = GRAPHENE_DEFAULT_FEE_LIQUIDATION_THRESHOLD; ///< value in CORE at which accumulated fees in blockchain-issued market assets should be liquidated share_type fee_liquidation_threshold = GRAPHENE_DEFAULT_FEE_LIQUIDATION_THRESHOLD; ///< value in CORE at which accumulated fees in blockchain-issued market assets should be liquidated
uint16_t accounts_per_fee_scale = GRAPHENE_DEFAULT_ACCOUNTS_PER_FEE_SCALE; ///< number of accounts between fee scalings uint16_t accounts_per_fee_scale = GRAPHENE_DEFAULT_ACCOUNTS_PER_FEE_SCALE; ///< number of accounts between fee scalings
uint8_t account_fee_scale_bitshifts = GRAPHENE_DEFAULT_ACCOUNT_FEE_SCALE_BITSHIFTS; ///< number of times to left bitshift account registration fee at each scaling uint8_t account_fee_scale_bitshifts = GRAPHENE_DEFAULT_ACCOUNT_FEE_SCALE_BITSHIFTS; ///< number of times to left bitshift account registration fee at each scaling
vector<parameter_extension> extensions;
void validate()const void validate()const
{ {
@ -642,7 +639,6 @@ FC_REFLECT( graphene::chain::chain_parameters,
(fee_liquidation_threshold) (fee_liquidation_threshold)
(accounts_per_fee_scale) (accounts_per_fee_scale)
(account_fee_scale_bitshifts) (account_fee_scale_bitshifts)
(extensions)
) )
FC_REFLECT_TYPENAME( graphene::chain::share_type ) FC_REFLECT_TYPENAME( graphene::chain::share_type )

1
programs/js_operation_serializer/main.cpp
View file

@ -367,7 +367,6 @@ int main( int argc, char** argv )
detail_ns::js_name<static_variant<address,public_key_type>>::name("key_data"); detail_ns::js_name<static_variant<address,public_key_type>>::name("key_data");
detail_ns::js_name<operation_result>::name("operation_result"); detail_ns::js_name<operation_result>::name("operation_result");
detail_ns::js_name<header_extension>::name("header_extension"); detail_ns::js_name<header_extension>::name("header_extension");
detail_ns::js_name<parameter_extension>::name("parameter_extension");
detail_ns::js_name<static_variant<refund_worker_type::initializer, vesting_balance_worker_type::initializer,burn_worker_type::initializer>>::name("worker_initializer"); detail_ns::js_name<static_variant<refund_worker_type::initializer, vesting_balance_worker_type::initializer,burn_worker_type::initializer>>::name("worker_initializer");
detail_ns::js_name<static_variant<linear_vesting_policy_initializer,cdd_vesting_policy_initializer>>::name("vesting_policy_initializer"); detail_ns::js_name<static_variant<linear_vesting_policy_initializer,cdd_vesting_policy_initializer>>::name("vesting_policy_initializer");
detail_ns::serializer<signed_block>::init(); detail_ns::serializer<signed_block>::init();