Skip to content

Commit 6474012

Browse files
committed
Reduce log level of exceptions in order_update_op
1 parent 8898b5a commit 6474012

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

libraries/chain/exceptions.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ namespace graphene { namespace chain {
8484
GRAPHENE_IMPLEMENT_OP_EVALUATE_EXCEPTION( insufficient_balance, limit_order_create, 6,
8585
"Insufficient balance" )
8686

87+
GRAPHENE_IMPLEMENT_OP_BASE_EXCEPTIONS( limit_order_update );
88+
GRAPHENE_IMPLEMENT_OP_EVALUATE_EXCEPTION( nonexist_order, limit_order_update, 1, "Order does not exist" )
89+
GRAPHENE_IMPLEMENT_OP_EVALUATE_EXCEPTION( owner_mismatch, limit_order_update, 2, "Order owned by someone else" )
90+
8791
GRAPHENE_IMPLEMENT_OP_BASE_EXCEPTIONS( limit_order_cancel );
8892
GRAPHENE_IMPLEMENT_OP_EVALUATE_EXCEPTION( nonexist_order, limit_order_cancel, 1, "Order does not exist" )
8993
GRAPHENE_IMPLEMENT_OP_EVALUATE_EXCEPTION( owner_mismatch, limit_order_cancel, 2, "Order owned by someone else" )

libraries/chain/include/graphene/chain/exceptions.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ namespace graphene { namespace chain {
138138
GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( receiving_asset_unauthorized, limit_order_create, 5 )
139139
GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( insufficient_balance, limit_order_create, 6 )
140140

141+
GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( limit_order_update );
142+
GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( nonexist_order, limit_order_update, 1 )
143+
GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( owner_mismatch, limit_order_update, 2 )
144+
141145
GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( limit_order_cancel );
142146
GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( nonexist_order, limit_order_cancel, 1 )
143147
GRAPHENE_DECLARE_OP_EVALUATE_EXCEPTION( owner_mismatch, limit_order_cancel, 2 )

libraries/chain/market_evaluator.cpp

+11-2
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,19 @@ void_result limit_order_update_evaluator::do_evaluate(const limit_order_update_o
156156
{
157157
const database& d = db();
158158
FC_ASSERT( HARDFORK_CORE_1604_PASSED( d.head_block_time() ) , "Operation has not activated yet");
159-
_order = &o.order(d);
159+
160+
_order = d.find( o.order );
161+
162+
GRAPHENE_ASSERT( _order != nullptr,
163+
limit_order_update_nonexist_order,
164+
"Limit order ${oid} does not exist, cannot update",
165+
("oid", o.order) );
160166

161167
// Check this is my order
162-
FC_ASSERT(o.seller == _order->seller, "Cannot update someone else's order");
168+
GRAPHENE_ASSERT( o.seller == _order->seller,
169+
limit_order_update_owner_mismatch,
170+
"Limit order ${oid} is owned by someone else, cannot update",
171+
("oid", o.order) );
163172

164173
// Check new price is compatible and appropriate
165174
if (o.new_price) {

libraries/net/node.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -3630,6 +3630,8 @@ namespace graphene { namespace net { namespace detail {
36303630
case graphene::chain::limit_order_create_selling_asset_unauthorized::code_enum::code_value :
36313631
case graphene::chain::limit_order_create_receiving_asset_unauthorized::code_enum::code_value :
36323632
case graphene::chain::limit_order_create_insufficient_balance::code_enum::code_value :
3633+
case graphene::chain::limit_order_update_nonexist_order::code_enum::code_value :
3634+
case graphene::chain::limit_order_update_owner_mismatch::code_enum::code_value :
36333635
case graphene::chain::limit_order_cancel_nonexist_order::code_enum::code_value :
36343636
case graphene::chain::limit_order_cancel_owner_mismatch::code_enum::code_value :
36353637
case graphene::chain::liquidity_pool_exchange_unfillable_price::code_enum::code_value :

0 commit comments

Comments
 (0)