clean-up error handling around price submission

Author: richardbrooks2000

pc/request.cpp

@@ -1154,6 +1154,11 @@ void price::reset()
   reset_err();
 }
 
+bool price::has_publisher()
+{
+  return has_publisher( *pkey_ );
+}
+
 bool price::has_publisher( const pub_key& key )
 {
   pc_pub_key_t *pk = (pc_pub_key_t*)key.data();
@@ -1192,18 +1197,16 @@ bool price::update(
   if ( PC_UNLIKELY( !init_ && !init_publish() ) ) {
     return false;
   }
-  if ( PC_UNLIKELY( !has_publisher( *pkey_ ) ) ) {
-    return set_err_msg( "not permissioned to update price" );
+  if ( PC_UNLIKELY( !has_publisher() ) ) {
+    return false;
   }
-  manager *cptr = get_manager();
-  if ( cptr && st_ == e_publish ) {
-    st_ = e_pend_publish;
-    preq_->set_price( price, conf, st, is_agg );
-    cptr->submit( this );
-    return true;
-  } else {
+  if ( PC_UNLIKELY( st_ != e_publish ) ) {
     return false;
   }
+  st_ = e_pend_publish;
+  preq_->set_price( price, conf, st, is_agg );
+  get_manager()->submit( this );
+  return true;
 }
 
 void price::submit()
@@ -1449,7 +1452,5 @@ void price_sched::submit()
 
 void price_sched::schedule()
 {
-  if ( ptr_->get_is_ready_publish() ) {
-    on_response_sub( this );
-  }
+  on_response_sub( this );
 }

pc/request.hpp

@@ -400,6 +400,9 @@ namespace pc
 
     price( const pub_key& );
 
+    // is current publisher authorized to publish on this symbol
+    bool has_publisher();
+
     // is publisher authorized to publish on this symbol
     bool has_publisher( const pub_key& );
 
@@ -409,6 +412,7 @@ namespace pc
     // submit new price update and update aggregate
     // will fail with false if in error (check get_is_err() )
     // or because symbol is not ready to publish (get_is_ready_publish())
+    // or because publisher does not have permission (has_publisher())
     bool update( int64_t price, uint64_t conf, symbol_status );
 
     // update aggregate price only

pc/user.cpp

@@ -9,6 +9,8 @@
 #define PC_JSON_UNKNOWN_METHOD  -32601
 #define PC_JSON_INVALID_PARAMS  -32602
 #define PC_JSON_UNKNOWN_SYMBOL  -32000
+#define PC_JSON_MISSING_PERMS   -32001
+#define PC_JSON_NOT_READY       -32002
 
 using namespace pc;
 
@@ -189,8 +191,14 @@ void user::parse_upd_price( uint32_t tok, uint32_t itok )
       add_header();
       jw_.add_key( "result", 0UL );
       add_tail( itok );
+    } else if ( !sptr->get_is_ready_publish() ) {
+      add_error( itok, PC_JSON_NOT_READY, "not ready to publish" );
+    } else if ( !sptr->has_publisher() ) {
+      add_error( itok, PC_JSON_MISSING_PERMS, "missing publish permission" );
     } else if ( sptr->get_is_err() ) {
       add_error( itok, PC_JSON_INVALID_REQUEST, sptr->get_err_msg() );
+    } else {
+      add_error( itok, PC_JSON_INVALID_REQUEST, "unknown error" );
     }
     return;
   } while( 0 );

pctest/test_publish.cpp

@@ -176,13 +176,7 @@ void test_publish::on_response( pc::price_sched *ptr, uint64_t sub_id )
   }
 
   // submit next price to block chain for this symbol
-  if ( !sym->update( px_, sprd_, pc::symbol_status::e_trading ) ) {
-    PC_LOG_ERR( "failed to submit price" )
-      .add( "symbol", *sym->get_symbol() )
-      .add( "price_type", pc::price_type_to_str( sym->get_price_type() ) )
-      .add( "err_msg", sym->get_err_msg() )
-      .end();
-  } else {
+  if ( sym->update( px_, sprd_, pc::symbol_status::e_trading ) ) {
     double price  = expo_ * (double)px_;
     double spread = expo_ * (double)sprd_;
     PC_LOG_INF( "submit price to block-chain" )
@@ -195,6 +189,27 @@ void test_publish::on_response( pc::price_sched *ptr, uint64_t sub_id )
       .end();
     // increase price
     px_ += sprd_;
+  } else if ( !sym->has_publisher() ) {
+    PC_LOG_WRN( "missing publish permission" )
+      .add( "symbol", *sym->get_symbol() )
+      .add( "price_type", pc::price_type_to_str( sym->get_price_type() ) )
+      .end();
+    // should work once publisher has been permissioned
+  } else if ( !sym->get_is_ready_publish() ) {
+    PC_LOG_WRN( "not ready to publish next price" )
+      .add( "symbol", *sym->get_symbol() )
+      .add( "price_type", pc::price_type_to_str( sym->get_price_type() ) )
+      .end();
+    // could be delay in confirmation - try again next time
+  } else if ( sym->get_is_err() ) {
+    PC_LOG_WRN( "block-chain error" )
+      .add( "symbol", *sym->get_symbol() )
+      .add( "price_type", pc::price_type_to_str( sym->get_price_type() ) )
+      .add( "err_msg", sym->get_err_msg() )
+      .end();
+    unsubscribe();
+    // either bad config or on-chain program problem - cant continue as is
+    // could try calling reset_err() and continue once error is resolved
   }
 }
 

pctest/test_pyth.py

@@ -146,7 +146,7 @@ async def test_2(uri1,uri2):
   await ws2.send( '{"id":18,"method":"update_price", "params":'
     '{"symbol":"US.EQ.SYMBOL3", "price_type": "price", "price": 1, '
     '"conf":2, "status": "trading"}}' )
-  check_error_obj( -32600, await ws2.recv(), idval=18 )
+  check_error_obj( -32001, await ws2.recv(), idval=18 )
 
   print('submitting subscriptions for symbols1, 2, 3')
   req = [ gen_sub( 'US.EQ.SYMBOL1', 1 ),