From 5cd73f5683721e179e923256f7bc84f808cbbd77 Mon Sep 17 00:00:00 2001 From: theoreticalbts Date: Tue, 20 Oct 2015 11:16:57 -0400 Subject: [PATCH] account_object.cpp: Get rid of no-ops --- libraries/chain/account_object.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libraries/chain/account_object.cpp b/libraries/chain/account_object.cpp index 80ae9e68..79729638 100644 --- a/libraries/chain/account_object.cpp +++ b/libraries/chain/account_object.cpp @@ -97,17 +97,11 @@ void account_statistics_object::process_fees(const account_object& a, database& assert( referrer_cut + registrar_cut + accumulated + reserveed + lifetime_cut == core_fee_total ); }; - share_type vesting_fee_subtotal(pending_fees); - share_type vested_fee_subtotal(pending_vested_fees); - share_type vesting_cashback, vested_cashback; + pay_out_fees(a, pending_fees, true); + pay_out_fees(a, pending_vested_fees, false); - pay_out_fees(a, vesting_fee_subtotal, true); - d.deposit_cashback(a, vesting_cashback, true); - pay_out_fees(a, vested_fee_subtotal, false); - d.deposit_cashback(a, vested_cashback, false); - - d.modify(*this, [vested_fee_subtotal, vesting_fee_subtotal](account_statistics_object& s) { - s.lifetime_fees_paid += vested_fee_subtotal + vesting_fee_subtotal; + d.modify(*this, [&](account_statistics_object& s) { + s.lifetime_fees_paid += pending_fees + pending_vested_fees; s.pending_fees = 0; s.pending_vested_fees = 0; });