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

Merge branch 'betting-merge' of https://bitbucket.org/peerplaysblockchain/peerplays-graphene into betting-merge

Browse source
This commit is contained in:
Roman Olearski 2017-07-26 22:25:05 +02:00
commit 6e33db129d
5 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/chain/betting_market_evaluator.cpp
View file

@ -195,6 +195,7 @@ object_id_type betting_market_create_evaluator::do_apply(const betting_market_cr
const betting_market_object& new_betting_market = const betting_market_object& new_betting_market =
db().create<betting_market_object>( [&]( betting_market_object& betting_market_obj ) { db().create<betting_market_object>( [&]( betting_market_object& betting_market_obj ) {
betting_market_obj.group_id = group_id; betting_market_obj.group_id = group_id;
betting_market_obj.description = op.description;
betting_market_obj.payout_condition = op.payout_condition; betting_market_obj.payout_condition = op.payout_condition;
}); });
return new_betting_market.id; return new_betting_market.id;

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

@ -130,7 +130,7 @@ typedef multi_index_container<
betting_market_group_object, betting_market_group_object,
indexed_by< indexed_by<
ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >, ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
ordered_non_unique< tag<by_event_id>, member<betting_market_group_object, event_id_type, &betting_market_group_object::event_id > > ordered_non_unique< tag<by_event_id>, member<betting_market_group_object, event_id_type, &betting_market_group_object::event_id> >
> > betting_market_group_object_multi_index_type; > > betting_market_group_object_multi_index_type;
typedef generic_index<betting_market_group_object, betting_market_group_object_multi_index_type> betting_market_group_object_index; typedef generic_index<betting_market_group_object, betting_market_group_object_multi_index_type> betting_market_group_object_index;
@ -138,7 +138,7 @@ typedef multi_index_container<
betting_market_object, betting_market_object,
indexed_by< indexed_by<
ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >, ordered_unique< tag<by_id>, member< object, object_id_type, &object::id > >,
ordered_non_unique< tag<by_betting_market_group_id>, member< betting_market_object, betting_market_group_id_type, &betting_market_object::group_id > > ordered_non_unique< tag<by_betting_market_group_id>, member<betting_market_object, betting_market_group_id_type, &betting_market_object::group_id> >
> > betting_market_object_multi_index_type; > > betting_market_object_multi_index_type;
typedef generic_index<betting_market_object, betting_market_object_multi_index_type> betting_market_object_index; typedef generic_index<betting_market_object, betting_market_object_multi_index_type> betting_market_object_index;

4
libraries/chain/include/graphene/chain/protocol/betting_market.hpp
View file

@ -133,6 +133,8 @@ struct betting_market_create_operation : public base_operation
*/ */
object_id_type group_id; object_id_type group_id;
internationalized_string_type description;
internationalized_string_type payout_condition; internationalized_string_type payout_condition;
extensions_type extensions; extensions_type extensions;
@ -379,7 +381,7 @@ FC_REFLECT( graphene::chain::betting_market_group_update_operation,
FC_REFLECT( graphene::chain::betting_market_create_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::betting_market_create_operation::fee_parameters_type, (fee) )
FC_REFLECT( graphene::chain::betting_market_create_operation, FC_REFLECT( graphene::chain::betting_market_create_operation,
(fee)(group_id)(payout_condition)(extensions) ) (fee)(group_id)(description)(payout_condition)(extensions) )
FC_REFLECT( graphene::chain::betting_market_update_operation::fee_parameters_type, (fee) ) FC_REFLECT( graphene::chain::betting_market_update_operation::fee_parameters_type, (fee) )
FC_REFLECT( graphene::chain::betting_market_update_operation, FC_REFLECT( graphene::chain::betting_market_update_operation,

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

@ -1660,6 +1660,7 @@ class wallet_api
const string& proposing_account, const string& proposing_account,
fc::time_point_sec expiration_time, fc::time_point_sec expiration_time,
betting_market_group_id_type group_id, betting_market_group_id_type group_id,
internationalized_string_type description,
internationalized_string_type payout_condition, internationalized_string_type payout_condition,
bool broadcast = false); bool broadcast = false);

2
libraries/wallet/wallet.cpp
View file

@ -5335,6 +5335,7 @@ signed_transaction wallet_api::propose_create_betting_market(
const string& proposing_account, const string& proposing_account,
fc::time_point_sec expiration_time, fc::time_point_sec expiration_time,
betting_market_group_id_type group_id, betting_market_group_id_type group_id,
internationalized_string_type description,
internationalized_string_type payout_condition, internationalized_string_type payout_condition,
bool broadcast /*= false*/) bool broadcast /*= false*/)
{ {
@ -5343,6 +5344,7 @@ signed_transaction wallet_api::propose_create_betting_market(
betting_market_create_operation betting_market_create_op; betting_market_create_operation betting_market_create_op;
betting_market_create_op.group_id = group_id; betting_market_create_op.group_id = group_id;
betting_market_create_op.description = description;
betting_market_create_op.payout_condition = payout_condition; betting_market_create_op.payout_condition = payout_condition;
proposal_create_operation prop_op; proposal_create_operation prop_op;