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

Merge branch 'rock-paper-scissors' of http://syncad.storm.pl:56780/blocktrades/graphene into rock-paper-scissors

Browse source
This commit is contained in:
Roman Olearski 2017-04-11 11:38:08 +02:00
commit db2b397afd
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,4 +186,8 @@
#define TOURNAMENT_MINIMAL_RAKE_FEE_PERCENTAGE (1*GRAPHENE_1_PERCENT)
#define TOURNAMENT_MAXIMAL_RAKE_FEE_PERCENTAGE (20*GRAPHENE_1_PERCENT)
#define TOURNAMENT_MAXIMAL_REGISTRATION_DEADLINE (60*60*24*30) // seconds, 30 days
#define TOURNAMENT_MAX_NUMBER_OF_WINS 100
#define TOURNAMENT_MAX_NUMBER_OF_WINS 100
#define TOURNAMENT_MAX_PLAYERS_NUMBER 256
#define TOURNAMENT_MAX_WHITELIST_LENGTH 1000
#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

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

@ -78,6 +78,11 @@ namespace graphene { namespace chain {
uint32_t max_time_per_reveal_move = TOURNAMENT_MAX_TIME_PER_REVEAL_MOVE; ///< maximal time to reveal move
uint16_t rake_fee_percentage = TOURNAMENT_DEFAULT_RAKE_FEE_PERCENTAGE; ///< part of prize paid into the dividend account for the core token holders
uint32_t maximum_registration_deadline = TOURNAMENT_MAXIMAL_REGISTRATION_DEADLINE; ///< value registration deadline must be before
uint16_t maximum_players_in_tournament = TOURNAMENT_MAX_PLAYERS_NUMBER; ///< maximal count of players in tournament
uint16_t maximum_tournament_whitelist_length = TOURNAMENT_MAX_WHITELIST_LENGTH; ///< maximal tournament whitelist length
uint32_t maximum_tournament_start_time_in_future = TOURNAMENT_MAX_START_TIME_IN_FUTURE;
uint32_t maximum_tournament_start_delay = TOURNAMENT_MAX_START_DELAY;
uint16_t maximum_tournament_number_of_wins = TOURNAMENT_MAX_NUMBER_OF_WINS;
extensions_type extensions;
/** defined in fee_schedule.cpp */
@ -123,5 +128,10 @@ FC_REFLECT( graphene::chain::chain_parameters,
(max_time_per_reveal_move)
(rake_fee_percentage)
(maximum_registration_deadline)
(maximum_players_in_tournament)
(maximum_tournament_whitelist_length)
(maximum_tournament_start_time_in_future)
(maximum_tournament_start_delay)
(maximum_tournament_number_of_wins)
(extensions)
)

18
libraries/chain/tournament_evaluator.cpp
View file

@ -13,7 +13,6 @@ namespace graphene { namespace chain {
database& d = db();
FC_ASSERT(op.options.registration_deadline >= d.head_block_time(), "Registration deadline has already passed");
// TODO: make this committee-set
const fc::time_point_sec maximum_registration_deadline = d.head_block_time() + d.get_global_properties().parameters.maximum_registration_deadline;
FC_ASSERT(op.options.registration_deadline <= maximum_registration_deadline,
"Registration deadline must be before ${maximum_registration_deadline}",
@ -21,18 +20,16 @@ namespace graphene { namespace chain {
FC_ASSERT(op.options.buy_in.amount >= 0, "Tournament buy-in may not be negative");
FC_ASSERT(op.options.number_of_players > 1, "If you're going to play with yourself, do it off-chain");
// TODO: make this committee-set
const uint32_t maximum_players_in_tournament = 256;
const uint32_t maximum_players_in_tournament = d.get_global_properties().parameters.maximum_players_in_tournament;
FC_ASSERT(op.options.number_of_players <= maximum_players_in_tournament,
"Tournaments may not have more than ${maximum_players_in_tournament} players",
("maximum_players_in_tournament", maximum_players_in_tournament));
// TODO: make this committee-set
const uint32_t maximum_tournament_whitelist_length = 1000;
FC_ASSERT(op.options.whitelist.empty() ||
op.options.whitelist.size() >= op.options.number_of_players,
"Whitelist must allow enough players to fill the tournament");
FC_ASSERT(op.options.whitelist.size() < maximum_tournament_whitelist_length,
const uint32_t maximum_tournament_whitelist_length = d.get_global_properties().parameters.maximum_tournament_whitelist_length;
FC_ASSERT(op.options.whitelist.size() < maximum_tournament_whitelist_length,
"Whitelist must not be longer than ${maximum_tournament_whitelist_length}",
("maximum_tournament_whitelist_length", maximum_tournament_whitelist_length));
@ -41,24 +38,21 @@ namespace graphene { namespace chain {
FC_ASSERT(!op.options.start_delay, "Cannot specify both a fixed start time and a delay");
FC_ASSERT(*op.options.start_time >= op.options.registration_deadline,
"Cannot start before registration deadline expires");
// TODO: make this committee-set
const uint32_t maximum_start_time_in_future = 60 * 60 * 24 * 7 * 4; // 1 month
const uint32_t maximum_start_time_in_future = d.get_global_properties().parameters.maximum_tournament_start_time_in_future;
FC_ASSERT((*op.options.start_time - d.head_block_time()).to_seconds() <= maximum_start_time_in_future,
"Start time is too far in the future");
}
else if (op.options.start_delay)
{
FC_ASSERT(!op.options.start_time, "Cannot specify both a fixed start time and a delay");
// TODO: make this committee-set
const uint32_t maximum_start_delay = 60 * 60 * 24 * 7; // 1 week
const uint32_t maximum_start_delay = d.get_global_properties().parameters.maximum_tournament_start_delay;
FC_ASSERT(*op.options.start_delay < maximum_start_delay,
"Start delay is too long");
}
else
FC_THROW("Must specify either a fixed start time or a delay");
// TODO: make this committee-set
const uint32_t maximum_tournament_number_of_wins = TOURNAMENT_MAX_NUMBER_OF_WINS;
const uint32_t maximum_tournament_number_of_wins = d.get_global_properties().parameters.maximum_tournament_number_of_wins;
FC_ASSERT(op.options.number_of_wins > 0);
FC_ASSERT(op.options.number_of_wins <= maximum_tournament_number_of_wins,
"Matches may not require more than ${number_of_wins} wins",