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

Minor code updates for asset_evaluator.cpp

Browse source 
* changed an `assert()` to `FC_ASSERT()`
* replaced one `db.get(asset_id_type())` with `db.get_core_asset()`
* capture only required variables for lambda
This commit is contained in:
abitmore 2018-07-03 13:19:38 -04:00 committed by gladcow
parent ac7ac9f1f2
commit e27b074f62
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libraries/chain/asset_evaluator.cpp
View file

@ -137,17 +137,17 @@ object_id_type asset_create_evaluator::do_apply( const asset_create_operation& o
bool hf_429 = fee_is_odd && db().head_block_time() > HARDFORK_CORE_429_TIME; bool hf_429 = fee_is_odd && db().head_block_time() > HARDFORK_CORE_429_TIME;
const asset_dynamic_data_object& dyn_asset = const asset_dynamic_data_object& dyn_asset =
db().create<asset_dynamic_data_object>( [&]( asset_dynamic_data_object& a ) { db().create<asset_dynamic_data_object>( [hf_429,this]( asset_dynamic_data_object& a ) {
a.current_supply = 0; a.current_supply = 0;
a.fee_pool = core_fee_paid - (hf_429 ? 1 : 0); a.fee_pool = core_fee_paid - (hf_429 ? 1 : 0);
}); });
if( fee_is_odd && !hf_429 ) if( fee_is_odd && !hf_429 )
{ {
const auto& core_dd = db().get<asset_object>( asset_id_type() ).dynamic_data( db() ); const auto& core_dd = db().get_core_asset().dynamic_data( db() );
db().modify( core_dd, [=]( asset_dynamic_data_object& dd ) { db().modify( core_dd, []( asset_dynamic_data_object& dd ) {
dd.current_supply++; dd.current_supply++;
}); });
} }
asset_bitasset_data_id_type bit_asset_id; asset_bitasset_data_id_type bit_asset_id;
if( op.bitasset_opts.valid() ) if( op.bitasset_opts.valid() )
@ -299,7 +299,7 @@ object_id_type lottery_asset_create_evaluator::do_apply( const lottery_asset_cre
asset_bitasset_data_id_type bit_asset_id; asset_bitasset_data_id_type bit_asset_id;
if( op.bitasset_opts.valid() ) if( op.bitasset_opts.valid() )
bit_asset_id = db().create<asset_bitasset_data_object>( [&]( asset_bitasset_data_object& a ) { bit_asset_id = db().create<asset_bitasset_data_object>( [&op,next_asset_id]( asset_bitasset_data_object& a ) {
a.options = *op.bitasset_opts; a.options = *op.bitasset_opts;
a.is_prediction_market = op.is_prediction_market; a.is_prediction_market = op.is_prediction_market;
}).id; }).id;
@ -307,7 +307,7 @@ object_id_type lottery_asset_create_evaluator::do_apply( const lottery_asset_cre
auto next_asset_id = db().get_index_type<asset_index>().get_next_id(); auto next_asset_id = db().get_index_type<asset_index>().get_next_id();
const asset_object& new_asset = const asset_object& new_asset =
db().create<asset_object>( [&]( asset_object& a ) { db().create<asset_object>( [&op,next_asset_id,&dyn_asset,bit_asset_id]( asset_object& a ) {
a.issuer = op.issuer; a.issuer = op.issuer;
a.symbol = op.symbol; a.symbol = op.symbol;
a.precision = op.precision; a.precision = op.precision;
@ -327,7 +327,7 @@ object_id_type lottery_asset_create_evaluator::do_apply( const lottery_asset_cre
if( op.bitasset_opts.valid() ) if( op.bitasset_opts.valid() )
a.bitasset_data_id = bit_asset_id; a.bitasset_data_id = bit_asset_id;
}); });
assert( new_asset.id == next_asset_id ); FC_ASSERT( new_asset.id == next_asset_id );
return new_asset.id; return new_asset.id;
} FC_CAPTURE_AND_RETHROW( (op) ) } } FC_CAPTURE_AND_RETHROW( (op) ) }
@ -354,7 +354,7 @@ void_result asset_issue_evaluator::do_apply( const asset_issue_operation& o )
{ try { { try {
db().adjust_balance( o.issue_to_account, o.asset_to_issue ); db().adjust_balance( o.issue_to_account, o.asset_to_issue );
db().modify( *asset_dyn_data, [&]( asset_dynamic_data_object& data ){ db().modify( *asset_dyn_data, [&o]( asset_dynamic_data_object& data ){
data.current_supply += o.asset_to_issue.amount; data.current_supply += o.asset_to_issue.amount;
}); });
@ -386,7 +386,7 @@ void_result asset_reserve_evaluator::do_apply( const asset_reserve_operation& o
{ try { { try {
db().adjust_balance( o.payer, -o.amount_to_reserve ); db().adjust_balance( o.payer, -o.amount_to_reserve );
db().modify( *asset_dyn_data, [&]( asset_dynamic_data_object& data ){ db().modify( *asset_dyn_data, [&o]( asset_dynamic_data_object& data ){
data.current_supply -= o.amount_to_reserve.amount; data.current_supply -= o.amount_to_reserve.amount;
}); });
@ -408,7 +408,7 @@ void_result asset_fund_fee_pool_evaluator::do_apply(const asset_fund_fee_pool_op
{ try { { try {
db().adjust_balance(o.from_account, -o.amount); db().adjust_balance(o.from_account, -o.amount);
db().modify( *asset_dyn_data, [&]( asset_dynamic_data_object& data ) { db().modify( *asset_dyn_data, [&o]( asset_dynamic_data_object& data ) {
data.fee_pool += o.amount; data.fee_pool += o.amount;
}); });
@ -483,7 +483,7 @@ void_result asset_update_evaluator::do_apply(const asset_update_operation& o)
d.cancel_order(*itr); d.cancel_order(*itr);
} }
d.modify(*asset_to_update, [&](asset_object& a) { d.modify(*asset_to_update, [&o](asset_object& a) {
if( o.new_issuer ) if( o.new_issuer )
a.issuer = *o.new_issuer; a.issuer = *o.new_issuer;
a.options = o.new_options; a.options = o.new_options;