Skip to content

Commit 83c66cd

Browse files
sgerbinosgerbino
committed
steemit#3461: Removal of ENABLE_SMT_SUPPORT CMake variable and associated define
1 parent dea42cd commit 83c66cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+8
-251
lines changed

‎CMakeLists.txt

-16
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@ if( BUILD_STEEM_TESTNET )
6060
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DIS_TEST_NET" )
6161
endif()
6262

63-
OPTION( ENABLE_SMT_SUPPORT "Build source with SMT support (ON OR OFF)" OFF )
64-
MESSAGE( STATUS "ENABLE_SMT_SUPPORT: ${ENABLE_SMT_SUPPORT}" )
65-
if( ENABLE_SMT_SUPPORT )
66-
MESSAGE( STATUS " " )
67-
MESSAGE( STATUS " CONFIGURING FOR SMT SUPPORT " )
68-
MESSAGE( STATUS " " )
69-
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTEEM_ENABLE_SMT" )
70-
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSTEEM_ENABLE_SMT" )
71-
endif()
72-
7363
OPTION( ENABLE_MIRA "Build source with MIRA (ON OR OFF)" OFF )
7464
MESSAGE( STATUS "ENABLE_MIRA: ${ENABLE_MIRA}" )
7565
if( ENABLE_MIRA )
@@ -323,12 +313,6 @@ else()
323313
MESSAGE( STATUS "\n\n CONFIGURED FOR STEEM NETWORK \n\n" )
324314
endif()
325315

326-
if( ENABLE_SMT_SUPPORT )
327-
MESSAGE( STATUS "\n\n CONFIGURED FOR SMT SUPPORT \n\n" )
328-
else()
329-
MESSAGE( STATUS "\n\n CONFIGURED FOR NO SUPPORT OF SMT \n\n" )
330-
endif()
331-
332316
if( ENABLE_MIRA )
333317
MESSAGE( STATUS "\n\n CONFIGURED FOR MIRA \n\n" )
334318
else()

‎libraries/chain/database.cpp

+2-43
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,6 @@ asset database::get_effective_vesting_shares( const account_object& account, ass
687687
if( vested_symbol == VESTS_SYMBOL )
688688
return account.vesting_shares - account.delegated_vesting_shares + account.received_vesting_shares;
689689

690-
#ifdef STEEM_ENABLE_SMT
691690
FC_ASSERT( vested_symbol.space() == asset_symbol_type::smt_nai_space );
692691
FC_ASSERT( vested_symbol.is_vesting() );
693692

@@ -698,9 +697,6 @@ asset database::get_effective_vesting_shares( const account_object& account, ass
698697
return asset( 0, vested_symbol );
699698

700699
return bo->vesting;
701-
#else
702-
FC_ASSERT( false, "Invalid symbol" );
703-
#endif
704700
}
705701

706702
uint32_t database::witness_participation_rate()const
@@ -1240,7 +1236,6 @@ asset create_vesting2( database& db, const account_object& to_account, asset liq
12401236
return new_vesting;
12411237
};
12421238

1243-
#ifdef STEEM_ENABLE_SMT
12441239
if( liquid.symbol.space() == asset_symbol_type::smt_nai_space )
12451240
{
12461241
FC_ASSERT( liquid.symbol.is_vesting() == false );
@@ -1275,7 +1270,6 @@ asset create_vesting2( database& db, const account_object& to_account, asset liq
12751270

12761271
return new_vesting;
12771272
}
1278-
#endif
12791273

12801274
FC_ASSERT( liquid.symbol == STEEM_SYMBOL );
12811275
// ^ A novelty, needed but risky in case someone managed to slip SBD/TESTS here in blockchain history.
@@ -2672,22 +2666,16 @@ void database::initialize_evaluators()
26722666
_my->_evaluator_registry.register_evaluator< reset_account_evaluator >();
26732667
_my->_evaluator_registry.register_evaluator< set_reset_account_evaluator >();
26742668
_my->_evaluator_registry.register_evaluator< claim_reward_balance_evaluator >();
2675-
#ifdef STEEM_ENABLE_SMT
26762669
_my->_evaluator_registry.register_evaluator< claim_reward_balance2_evaluator >();
2677-
#endif
26782670
_my->_evaluator_registry.register_evaluator< account_create_with_delegation_evaluator >();
26792671
_my->_evaluator_registry.register_evaluator< delegate_vesting_shares_evaluator >();
26802672
_my->_evaluator_registry.register_evaluator< witness_set_properties_evaluator >();
2681-
2682-
#ifdef STEEM_ENABLE_SMT
26832673
_my->_evaluator_registry.register_evaluator< smt_setup_evaluator >();
26842674
_my->_evaluator_registry.register_evaluator< smt_setup_emissions_evaluator >();
26852675
_my->_evaluator_registry.register_evaluator< smt_set_setup_parameters_evaluator >();
26862676
_my->_evaluator_registry.register_evaluator< smt_set_runtime_parameters_evaluator >();
26872677
_my->_evaluator_registry.register_evaluator< smt_create_evaluator >();
26882678
_my->_evaluator_registry.register_evaluator< smt_contribute_evaluator >();
2689-
#endif
2690-
26912679
_my->_evaluator_registry.register_evaluator< create_proposal_evaluator >();
26922680
_my->_evaluator_registry.register_evaluator< update_proposal_votes_evaluator >();
26932681
_my->_evaluator_registry.register_evaluator< remove_proposal_evaluator >();
@@ -2699,14 +2687,12 @@ void database::initialize_evaluators()
26992687
_my->_opt_action_evaluator_registry.register_evaluator< example_optional_evaluator >();
27002688
#endif
27012689

2702-
#ifdef STEEM_ENABLE_SMT
27032690
_my->_req_action_evaluator_registry.register_evaluator< smt_ico_launch_evaluator >();
27042691
_my->_req_action_evaluator_registry.register_evaluator< smt_ico_evaluation_evaluator >();
27052692
_my->_req_action_evaluator_registry.register_evaluator< smt_token_launch_evaluator >();
27062693
_my->_req_action_evaluator_registry.register_evaluator< smt_refund_evaluator >();
27072694
_my->_req_action_evaluator_registry.register_evaluator< smt_contributor_payout_evaluator >();
27082695
_my->_req_action_evaluator_registry.register_evaluator< smt_founder_payout_evaluator >();
2709-
#endif
27102696
}
27112697

27122698

@@ -2946,9 +2932,7 @@ void database::init_genesis( uint64_t init_supply, uint64_t sbd_init_supply )
29462932
util::rd_setup_dynamics_params( account_subsidy_per_witness_user_params, account_subsidy_system_params, wso.account_subsidy_witness_rd );
29472933
} );
29482934

2949-
#ifdef STEEM_ENABLE_SMT
29502935
create< nai_pool_object >( [&]( nai_pool_object& npo ) {} );
2951-
#endif
29522936
}
29532937
FC_CAPTURE_AND_RETHROW()
29542938
}
@@ -4354,7 +4338,7 @@ void database::clear_expired_delegations()
43544338
itr = delegations_by_exp.begin();
43554339
}
43564340
}
4357-
#ifdef STEEM_ENABLE_SMT
4341+
43584342
template< typename smt_balance_object_type, class balance_operator_type >
43594343
void database::adjust_smt_balance( const account_name_type& name, const asset& delta, bool check_account,
43604344
balance_operator_type balance_operator )
@@ -4404,7 +4388,6 @@ void database::adjust_smt_balance( const account_name_type& name, const asset& d
44044388
}
44054389
}
44064390
}
4407-
#endif
44084391

44094392
void database::modify_balance( const account_object& a, const asset& delta, bool check_balance )
44104393
{
@@ -4524,7 +4507,6 @@ const index_delegate_map& database::index_delegates()
45244507
return _index_delegate_map;
45254508
}
45264509

4527-
#ifdef STEEM_ENABLE_SMT
45284510
struct smt_regular_balance_operator
45294511
{
45304512
smt_regular_balance_operator( const asset& delta ) : delta(delta), is_vesting(delta.symbol.is_vesting()) {}
@@ -4577,7 +4559,6 @@ struct smt_reward_balance_operator
45774559
asset share_delta;
45784560
bool is_vesting;
45794561
};
4580-
#endif
45814562

45824563
void database::adjust_balance( const account_object& a, const asset& delta )
45834564
{
@@ -4591,7 +4572,6 @@ void database::adjust_balance( const account_object& a, const asset& delta )
45914572

45924573
bool check_balance = has_hardfork( STEEM_HARDFORK_0_20__1811 );
45934574

4594-
#ifdef STEEM_ENABLE_SMT
45954575
if( delta.symbol.space() == asset_symbol_type::smt_nai_space )
45964576
{
45974577
// No account object modification for SMT balance, hence separate handling here.
@@ -4600,7 +4580,6 @@ void database::adjust_balance( const account_object& a, const asset& delta )
46004580
adjust_smt_balance< account_regular_balance_object >( a.name, delta, false/*check_account*/, balance_operator );
46014581
}
46024582
else
4603-
#endif
46044583
{
46054584
modify_balance( a, delta, check_balance );
46064585
}
@@ -4618,7 +4597,6 @@ void database::adjust_balance( const account_name_type& name, const asset& delta
46184597

46194598
bool check_balance = has_hardfork( STEEM_HARDFORK_0_20__1811 );
46204599

4621-
#ifdef STEEM_ENABLE_SMT
46224600
if( delta.symbol.space() == asset_symbol_type::smt_nai_space )
46234601
{
46244602
// No account object modification for SMT balance, hence separate handling here.
@@ -4627,7 +4605,6 @@ void database::adjust_balance( const account_name_type& name, const asset& delta
46274605
adjust_smt_balance< account_regular_balance_object >( name, delta, false/*check_account*/, balance_operator );
46284606
}
46294607
else
4630-
#endif
46314608
{
46324609
modify_balance( get_account( name ), delta, check_balance );
46334610
}
@@ -4693,7 +4670,6 @@ void database::adjust_reward_balance( const account_object& a, const asset& valu
46934670
bool check_balance = has_hardfork( STEEM_HARDFORK_0_20__1811 );
46944671
FC_ASSERT( value_delta.symbol.is_vesting() == false && share_delta.symbol.is_vesting() );
46954672

4696-
#ifdef STEEM_ENABLE_SMT
46974673
// No account object modification for SMT balance, hence separate handling here.
46984674
// Note that SMT related code, being post-20-hf needs no hf-guard to do balance checks.
46994675
if( value_delta.symbol.space() == asset_symbol_type::smt_nai_space )
@@ -4702,7 +4678,6 @@ void database::adjust_reward_balance( const account_object& a, const asset& valu
47024678
adjust_smt_balance< account_rewards_balance_object >( a.name, value_delta, false/*check_account*/, balance_operator );
47034679
return;
47044680
}
4705-
#endif
47064681

47074682
modify_reward_balance(a, value_delta, share_delta, check_balance);
47084683
}
@@ -4713,7 +4688,6 @@ void database::adjust_reward_balance( const account_name_type& name, const asset
47134688
bool check_balance = has_hardfork( STEEM_HARDFORK_0_20__1811 );
47144689
FC_ASSERT( value_delta.symbol.is_vesting() == false && share_delta.symbol.is_vesting() );
47154690

4716-
#ifdef STEEM_ENABLE_SMT
47174691
// No account object modification for SMT balance, hence separate handling here.
47184692
// Note that SMT related code, being post-20-hf needs no hf-guard to do balance checks.
47194693
if( value_delta.symbol.space() == asset_symbol_type::smt_nai_space )
@@ -4722,15 +4696,13 @@ void database::adjust_reward_balance( const account_name_type& name, const asset
47224696
adjust_smt_balance< account_rewards_balance_object >( name, value_delta, true/*check_account*/, balance_operator );
47234697
return;
47244698
}
4725-
#endif
47264699

47274700
const auto& a = get_account( name );
47284701
modify_reward_balance(a, value_delta, share_delta, check_balance);
47294702
}
47304703

47314704
void database::adjust_supply( const asset& delta, bool adjust_vesting )
47324705
{
4733-
#ifdef STEEM_ENABLE_SMT
47344706
if( delta.symbol.space() == asset_symbol_type::smt_nai_space )
47354707
{
47364708
const auto& smt = get< smt_token_object, by_symbol >( delta.symbol );
@@ -4742,7 +4714,6 @@ void database::adjust_supply( const asset& delta, bool adjust_vesting )
47424714
});
47434715
return;
47444716
}
4745-
#endif
47464717

47474718
bool check_supply = has_hardfork( STEEM_HARDFORK_0_20__1811 );
47484719

@@ -4791,7 +4762,6 @@ asset database::get_balance( const account_object& a, asset_symbol_type symbol )
47914762
return a.sbd_balance;
47924763
default:
47934764
{
4794-
#ifdef STEEM_ENABLE_SMT
47954765
FC_ASSERT( symbol.space() == asset_symbol_type::smt_nai_space, "Invalid symbol: ${s}", ("s", symbol) );
47964766
auto key = boost::make_tuple( a.name, symbol.is_vesting() ? symbol.get_paired_symbol() : symbol );
47974767
const account_regular_balance_object* arbo = find< account_regular_balance_object, by_owner_liquid_symbol >( key );
@@ -4803,16 +4773,12 @@ asset database::get_balance( const account_object& a, asset_symbol_type symbol )
48034773
{
48044774
return symbol.is_vesting() ? arbo->vesting : arbo->liquid;
48054775
}
4806-
#else
4807-
FC_ASSERT( false, "Invalid symbol: ${s}", ("s", symbol) );
4808-
#endif
48094776
}
48104777
}
48114778
}
48124779

48134780
asset database::get_balance( const account_name_type& name, asset_symbol_type symbol )const
48144781
{
4815-
#ifdef STEEM_ENABLE_SMT
48164782
if ( symbol.space() == asset_symbol_type::smt_nai_space )
48174783
{
48184784
auto key = boost::make_tuple( name, symbol.is_vesting() ? symbol.get_paired_symbol() : symbol );
@@ -4827,7 +4793,6 @@ asset database::get_balance( const account_name_type& name, asset_symbol_type sy
48274793
return symbol.is_vesting() ? arbo->vesting : arbo->liquid;
48284794
}
48294795
}
4830-
#endif
48314796
return get_balance( get_account( name ), symbol );
48324797
}
48334798

@@ -5336,9 +5301,8 @@ void database::apply_hardfork( uint32_t hardfork )
53365301
break;
53375302
case STEEM_SMT_HARDFORK:
53385303
{
5339-
#ifdef STEEM_ENABLE_SMT
53405304
replenish_nai_pool( *this );
5341-
#endif
5305+
53425306
modify( get_dynamic_global_properties(), [&]( dynamic_global_property_object& gpo )
53435307
{
53445308
gpo.required_actions_partition_percent = 25 * STEEM_1_PERCENT;
@@ -5471,7 +5435,6 @@ void database::validate_invariants()const
54715435
total_supply += itr->reward_balance;
54725436
}
54735437

5474-
#ifdef STEEM_ENABLE_SMT
54755438
const auto& smt_ico_idx = get_index< smt_ico_index, by_id >();
54765439

54775440
for ( auto itr = smt_ico_idx.begin(); itr != smt_ico_idx.end(); ++itr )
@@ -5488,7 +5451,6 @@ void database::validate_invariants()const
54885451
{
54895452
total_supply += itr->market_maker.steem_balance;
54905453
}
5491-
#endif
54925454

54935455
total_supply += gpo.total_vesting_fund_steem + gpo.total_reward_fund_steem + gpo.pending_rewarded_vesting_steem;
54945456

@@ -5511,8 +5473,6 @@ void database::validate_invariants()const
55115473
FC_CAPTURE_LOG_AND_RETHROW( (head_block_num()) );
55125474
}
55135475

5514-
#ifdef STEEM_ENABLE_SMT
5515-
55165476
namespace {
55175477
template <typename index_type, typename lambda>
55185478
void add_from_balance_index(const index_type& balance_idx, lambda callback )
@@ -5638,7 +5598,6 @@ void database::validate_smt_invariants()const
56385598
}
56395599
FC_CAPTURE_LOG_AND_RETHROW( (head_block_num()) );
56405600
}
5641-
#endif
56425601

56435602
void database::perform_vesting_share_split( uint32_t magnitude )
56445603
{

‎libraries/chain/include/steem/chain/comment_object.hpp

-12
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ namespace steem { namespace chain {
1313
using protocol::beneficiary_route_type;
1414
using chainbase::t_vector;
1515
using chainbase::t_pair;
16-
#ifdef STEEM_ENABLE_SMT
1716
using protocol::votable_asset_info;
18-
#endif
1917

2018
struct strcmp_less
2119
{
@@ -51,9 +49,7 @@ namespace steem { namespace chain {
5149
template< typename Constructor, typename Allocator >
5250
comment_object( Constructor&& c, allocator< Allocator > a )
5351
:category( a ), parent_permlink( a ), permlink( a ), beneficiaries( a )
54-
#ifdef STEEM_ENABLE_SMT
5552
, allowed_vote_assets( a )
56-
#endif
5753
{
5854
c( *this );
5955
}
@@ -106,10 +102,8 @@ namespace steem { namespace chain {
106102

107103
using t_beneficiaries = t_vector< beneficiary_route_type >;
108104
t_beneficiaries beneficiaries;
109-
#ifdef STEEM_ENABLE_SMT
110105
using t_votable_assets = t_vector< t_pair< asset_symbol_type, votable_asset_info > >;
111106
t_votable_assets allowed_vote_assets;
112-
#endif
113107
};
114108

115109
class comment_content_object : public object< comment_content_object_type, comment_content_object >
@@ -279,9 +273,7 @@ FC_REFLECT( steem::chain::comment_object,
279273
(total_vote_weight)(reward_weight)(total_payout_value)(curator_payout_value)(beneficiary_payout_value)(author_rewards)(net_votes)(root_comment)
280274
(max_accepted_payout)(percent_steem_dollars)(allow_replies)(allow_votes)(allow_curation_rewards)
281275
(beneficiaries)
282-
#ifdef STEEM_ENABLE_SMT
283276
(allowed_vote_assets)
284-
#endif
285277
)
286278

287279
CHAINBASE_SET_INDEX_TYPE( steem::chain::comment_object, steem::chain::comment_index )
@@ -305,9 +297,7 @@ namespace helpers
305297
public:
306298
typedef steem::chain::comment_index IndexType;
307299
typedef typename steem::chain::comment_object::t_beneficiaries t_beneficiaries;
308-
#ifdef STEEM_ENABLE_SMT
309300
typedef typename steem::chain::comment_object::t_votable_assets t_votable_assets;
310-
#endif
311301
index_statistic_info gather_statistics(const IndexType& index, bool onlyStaticInfo) const
312302
{
313303
index_statistic_info info;
@@ -321,9 +311,7 @@ namespace helpers
321311
info._item_additional_allocation += o.parent_permlink.capacity()*sizeof(shared_string::value_type);
322312
info._item_additional_allocation += o.permlink.capacity()*sizeof(shared_string::value_type);
323313
info._item_additional_allocation += o.beneficiaries.capacity()*sizeof(t_beneficiaries::value_type);
324-
#ifdef STEEM_ENABLE_SMT
325314
info._item_additional_allocation += o.allowed_vote_assets.capacity()*sizeof(t_votable_assets::value_type);
326-
#endif
327315
}
328316
}
329317

‎libraries/chain/include/steem/chain/database.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -517,12 +517,10 @@ namespace steem { namespace chain {
517517
bool disable_low_mem_warning = true;
518518
#endif
519519

520-
#ifdef STEEM_ENABLE_SMT
521520
///Smart Media Tokens related methods
522521
///@{
523522
void validate_smt_invariants()const;
524523
///@}
525-
#endif
526524

527525
protected:
528526
//Mark pop_undo() as protected -- we do not want outside calling pop_undo(); it should call pop_block() instead
@@ -567,11 +565,9 @@ namespace steem { namespace chain {
567565
void apply_hardfork( uint32_t hardfork );
568566

569567
///@}
570-
#ifdef STEEM_ENABLE_SMT
571568
template< typename smt_balance_object_type, class balance_operator_type >
572569
void adjust_smt_balance( const account_name_type& name, const asset& delta, bool check_account,
573570
balance_operator_type balance_operator );
574-
#endif
575571
void modify_balance( const account_object& a, const asset& delta, bool check_balance );
576572
void modify_reward_balance( const account_object& a, const asset& value_delta, const asset& share_delta, bool check_balance );
577573

0 commit comments

Comments
 (0)