From 40a28e6e50353fd4eb589f43cab0a4143b181cbd Mon Sep 17 00:00:00 2001 From: James Calfee Date: Fri, 12 Jun 2015 09:06:58 -0500 Subject: [PATCH] Enhanced asset and price_feed validation error messages. --- libraries/chain/asset.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/chain/asset.cpp b/libraries/chain/asset.cpp index b3b0152f..cb1f6fdb 100644 --- a/libraries/chain/asset.cpp +++ b/libraries/chain/asset.cpp @@ -116,7 +116,7 @@ namespace graphene { namespace chain { FC_ASSERT( base.amount > share_type(0) ); FC_ASSERT( quote.amount > share_type(0) ); FC_ASSERT( base.asset_id != quote.asset_id ); - } FC_CAPTURE_AND_RETHROW() } + } FC_CAPTURE_AND_RETHROW( (base)(quote) ) } void price_feed::validate() const { try { @@ -133,6 +133,7 @@ namespace graphene { namespace chain { FC_ASSERT( required_maintenance_collateral < required_initial_collateral ); FC_ASSERT( required_maintenance_collateral >= 1000 ); FC_ASSERT( call_limit.is_null() || call_limit < ~short_limit ); - } FC_CAPTURE_AND_RETHROW() } + } FC_CAPTURE_AND_RETHROW( (call_limit.is_null())(short_limit.is_null())(call_limit)(short_limit) + (max_margin_period_sec)(required_maintenance_collateral)(required_initial_collateral) ) } } } // graphene::chain