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

Merge branches '538-fork-buyback', '562-util-check-reflection' and '575-bugfix-settle-reflect' into develop

Browse source 
Fix reflection bugs and enhance check_reflect.py
This commit is contained in:
theoreticalbts 2016-02-15 15:37:50 -05:00
commit fe0920ddc8
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/chain/include/graphene/chain/buyback_object.hpp
View file

@ -64,4 +64,4 @@ typedef generic_index< buyback_object, buyback_multi_index_type > buyback_index;
} } // graphene::chain
FC_REFLECT( graphene::chain::buyback_object, (asset_to_buy) )
FC_REFLECT_DERIVED( graphene::chain::buyback_object, (graphene::db::object), (asset_to_buy) )

5
libraries/chain/include/graphene/chain/market_object.hpp
View file

@ -206,4 +206,7 @@ FC_REFLECT_DERIVED( graphene::chain::limit_order_object,
FC_REFLECT_DERIVED( graphene::chain::call_order_object, (graphene::db::object),
(borrower)(collateral)(debt)(call_price) )
FC_REFLECT( graphene::chain::force_settlement_object, (owner)(balance)(settlement_date) )
FC_REFLECT_DERIVED( graphene::chain::force_settlement_object,
(graphene::db::object),
(owner)(balance)(settlement_date)
)

2
programs/build_helpers/check_reflect.py
View file

@ -87,6 +87,8 @@ for root, dirs, files in os.walk("."):
cname = m.group(1)
members = bubble_list(m.group(2))
name2members_re[cname] = members
if cname.endswith("_object"):
print("FC_REFLECT on {} should be FC_REFLECT_DERIVED".format(cname))
for m in re_reflect_derived.finditer(content):
cname = m.group(1)
members = bubble_list(m.group(3))