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

Implemented sport delete operation added test.

Browse source
This commit is contained in:
Apr Team 2018-05-12 13:29:43 +03:00 committed by Fabian Schuh
parent 4f501f6aaf
commit 71fec0ac83
4 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/chain/sport_evaluator.cpp
View file

@ -57,7 +57,7 @@ void_result sport_update_evaluator::do_evaluate(const sport_update_operation& op
return void_result(); return void_result();
} FC_CAPTURE_AND_RETHROW( (op) ) } } FC_CAPTURE_AND_RETHROW( (op) ) }
void_result sport_update_evaluator::do_apply(const sport_update_operation& op) void_result sport_update_evaluator::do_apply(const sport_update_operation& op)
{ try { { try {
database& _db = db(); database& _db = db();
_db.modify( _db.modify(
@ -71,10 +71,17 @@ void_result sport_update_evaluator::do_evaluate(const sport_update_operation& op
} FC_CAPTURE_AND_RETHROW( (op) ) } } FC_CAPTURE_AND_RETHROW( (op) ) }
void_result sport_delete_evaluator::do_evaluate( const sport_delete_operation& o ) void_result sport_delete_evaluator::do_evaluate( const sport_delete_operation& op )
{} { try {
FC_ASSERT(trx_state->_is_proposed_trx);
return void_result();
} FC_CAPTURE_AND_RETHROW( (op) ) }
void_result sport_delete_evaluator::do_apply( const sport_delete_operation& o ) void_result sport_delete_evaluator::do_apply( const sport_delete_operation& op )
{} { try {
database& _db = db();
_db.remove(_db.get(op.sport_id));
return void_result();
} FC_CAPTURE_AND_RETHROW( (op) ) }
} } // graphene::chain } } // graphene::chain

14
tests/betting/betting_tests.cpp
View file

@ -1143,7 +1143,7 @@ BOOST_AUTO_TEST_CASE(delayed_bets_test) // test live betting
// bob's bet will still be delayed, so the active order book will only contain alice's bet // bob's bet will still be delayed, so the active order book will only contain alice's bet
first_bet_in_market = bet_odds_idx.lower_bound(std::make_tuple(capitals_win_market.id)); first_bet_in_market = bet_odds_idx.lower_bound(std::make_tuple(capitals_win_market.id));
last_bet_in_market = bet_odds_idx.upper_bound(std::make_tuple(capitals_win_market.id)); last_bet_in_market = bet_odds_idx.upper_bound(std::make_tuple(capitals_win_market.id));
edump((std::distance(first_bet_in_market, last_bet_in_market))); // edump((std::distance(first_bet_in_market, last_bet_in_market)));
BOOST_CHECK(std::distance(first_bet_in_market, last_bet_in_market) == 1); BOOST_CHECK(std::distance(first_bet_in_market, last_bet_in_market) == 1);
for (const auto& bet : boost::make_iterator_range(first_bet_in_market, last_bet_in_market)) for (const auto& bet : boost::make_iterator_range(first_bet_in_market, last_bet_in_market))
edump((bet)); edump((bet));
@ -1527,6 +1527,18 @@ BOOST_AUTO_TEST_CASE(sport_update_test)
} FC_LOG_AND_RETHROW() } FC_LOG_AND_RETHROW()
} }
BOOST_AUTO_TEST_CASE(sport_delete_test)
{
try
{
ACTORS( (alice) );
CREATE_ICE_HOCKEY_BETTING_MARKET(false, 0);
delete_sport(ice_hockey.id);
const auto& sport_by_id = db.get_index_type<sport_object_index>().indices().get<by_id>();
BOOST_CHECK(sport_by_id.end() == sport_by_id.find(ice_hockey.id));
} FC_LOG_AND_RETHROW()
}
BOOST_AUTO_TEST_CASE(event_group_update_test) BOOST_AUTO_TEST_CASE(event_group_update_test)
{ {
try try

8
tests/common/database_fixture.cpp
View file

@ -1300,6 +1300,13 @@ void database_fixture::update_sport(sport_id_type sport_id, internationalized_st
process_operation_by_witnesses(sport_update_op); process_operation_by_witnesses(sport_update_op);
} FC_CAPTURE_AND_RETHROW( (sport_id)(name) ) } } FC_CAPTURE_AND_RETHROW( (sport_id)(name) ) }
void database_fixture::delete_sport(sport_id_type sport_id)
{ try {
sport_delete_operation sport_delete_op;
sport_delete_op.sport_id = sport_id;
process_operation_by_witnesses(sport_delete_op);
} FC_CAPTURE_AND_RETHROW( (sport_id) ) }
const event_group_object& database_fixture::create_event_group(internationalized_string_type name, sport_id_type sport_id) const event_group_object& database_fixture::create_event_group(internationalized_string_type name, sport_id_type sport_id)
{ try { { try {
event_group_create_operation event_group_create_op; event_group_create_operation event_group_create_op;
@ -1310,7 +1317,6 @@ const event_group_object& database_fixture::create_event_group(internationalized
return *event_group_index.rbegin(); return *event_group_index.rbegin();
} FC_CAPTURE_AND_RETHROW( (name) ) } } FC_CAPTURE_AND_RETHROW( (name) ) }
void database_fixture::update_event_group(event_group_id_type event_group_id, void database_fixture::update_event_group(event_group_id_type event_group_id,
fc::optional<object_id_type> sport_id, fc::optional<object_id_type> sport_id,
fc::optional<internationalized_string_type> name) fc::optional<internationalized_string_type> name)

1
tests/common/database_fixture.hpp
View file

@ -304,6 +304,7 @@ struct database_fixture {
void set_is_proposed_trx(operation op); void set_is_proposed_trx(operation op);
const sport_object& create_sport(internationalized_string_type name); const sport_object& create_sport(internationalized_string_type name);
void update_sport(sport_id_type sport_id, internationalized_string_type name); void update_sport(sport_id_type sport_id, internationalized_string_type name);
void delete_sport(sport_id_type sport_id);
const event_group_object& create_event_group(internationalized_string_type name, sport_id_type sport_id); const event_group_object& create_event_group(internationalized_string_type name, sport_id_type sport_id);
void update_event_group(event_group_id_type event_group_id, void update_event_group(event_group_id_type event_group_id,
fc::optional<object_id_type> sport_id, fc::optional<object_id_type> sport_id,