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

Minor code cleanup

Browse source
This commit is contained in:
Srdjan Obucina 2019-10-09 15:46:16 +02:00
parent 54599cc22b
commit bdfbf5c87b
5 changed files with 79 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/chain/include/graphene/chain/config.hpp
View file

@ -231,8 +231,6 @@
#define TOURNAMENT_MAX_WHITELIST_LENGTH 1000 #define TOURNAMENT_MAX_WHITELIST_LENGTH 1000
#define TOURNAMENT_MAX_START_TIME_IN_FUTURE (60*60*24*7*4) // 1 month #define TOURNAMENT_MAX_START_TIME_IN_FUTURE (60*60*24*7*4) // 1 month
#define TOURNAMENT_MAX_START_DELAY (60*60*24*7) // 1 week #define TOURNAMENT_MAX_START_DELAY (60*60*24*7) // 1 week
#define GPOS_PERIOD (60*60*24*30*6) // 6 months
#define GPOS_SUBPERIOD (60*60*24*30) // 1 month
#define MIN_SON_MEMBER_COUNT 15 #define MIN_SON_MEMBER_COUNT 15
#define SWEEPS_DEFAULT_DISTRIBUTION_PERCENTAGE (2*GRAPHENE_1_PERCENT) #define SWEEPS_DEFAULT_DISTRIBUTION_PERCENTAGE (2*GRAPHENE_1_PERCENT)

7
libraries/chain/include/graphene/chain/protocol/chain_parameters.hpp
View file

@ -37,10 +37,6 @@ namespace graphene { namespace chain {
optional< uint16_t > betting_rake_fee_percentage; optional< uint16_t > betting_rake_fee_percentage;
optional< flat_map<bet_multiplier_type, bet_multiplier_type> > permitted_betting_odds_increments; optional< flat_map<bet_multiplier_type, bet_multiplier_type> > permitted_betting_odds_increments;
optional< uint16_t > live_betting_delay_time; optional< uint16_t > live_betting_delay_time;
/* gpos parameters */
optional < uint32_t > gpos_period;
optional < uint32_t > gpos_subperiod;
optional < uint32_t > gpos_period_start;
optional < uint16_t > son_count; optional < uint16_t > son_count;
optional< uint16_t > sweeps_distribution_percentage; optional< uint16_t > sweeps_distribution_percentage;
optional< asset_id_type > sweeps_distribution_asset; optional< asset_id_type > sweeps_distribution_asset;
@ -138,9 +134,6 @@ FC_REFLECT( graphene::chain::parameter_extension,
(betting_rake_fee_percentage) (betting_rake_fee_percentage)
(permitted_betting_odds_increments) (permitted_betting_odds_increments)
(live_betting_delay_time) (live_betting_delay_time)
(gpos_period)
(gpos_subperiod)
(gpos_period_start)
(son_count) (son_count)
(sweeps_distribution_percentage) (sweeps_distribution_percentage)
(sweeps_distribution_asset) (sweeps_distribution_asset)

5
libraries/chain/proposal_evaluator.cpp
View file

@ -135,11 +135,6 @@ struct proposal_operation_hardfork_visitor
FC_ASSERT( block_time >= HARDFORK_1000_TIME, "event_update_status_operation not allowed yet!" ); FC_ASSERT( block_time >= HARDFORK_1000_TIME, "event_update_status_operation not allowed yet!" );
} }
void operator()(const vesting_balance_create_operation &vbco) const {
if(block_time < HARDFORK_GPOS_TIME)
FC_ASSERT( vbco.balance_type == vesting_balance_type::unspecified, "balance_type in vesting create not allowed yet!" );
}
void operator()(const son_create_operation &v) const { void operator()(const son_create_operation &v) const {
FC_ASSERT( block_time >= HARDFORK_SON_TIME, "son_create_operation not allowed yet!" ); FC_ASSERT( block_time >= HARDFORK_SON_TIME, "son_create_operation not allowed yet!" );
} }

2
libraries/plugins/peerplays_sidechain/CMakeLists.txt
View file

@ -1,4 +1,4 @@
file(GLOB HEADERS "include/graphene/peerplays_sidechain_history/*.hpp") file(GLOB HEADERS "include/graphene/peerplays_sidechain/*.hpp")
add_library( peerplays_sidechain add_library( peerplays_sidechain
peerplays_sidechain_plugin.cpp peerplays_sidechain_plugin.cpp

2
libraries/wallet/include/graphene/wallet/wallet.hpp
View file

@ -1284,7 +1284,7 @@ class wallet_api
*/ */
map<string, committee_member_id_type> list_committee_members(const string& lowerbound, uint32_t limit); map<string, committee_member_id_type> list_committee_members(const string& lowerbound, uint32_t limit);
/** Returns information about the given son. /** Returns information about the given SON.
* @param owner_account the name or id of the SON account owner, or the id of the SON * @param owner_account the name or id of the SON account owner, or the id of the SON
* @returns the information about the SON stored in the block chain * @returns the information about the SON stored in the block chain
*/ */