Remove upd_test and init_test oracle instructions (#182)

* Remove upd_test and init_test oracle instructions

* Remove init_test and upd_test from pyth_admin

* Don't run init_test in setup_local script

Author: tompntn

pcapps/admin_request.cpp

@@ -1055,234 +1055,6 @@ bool del_publisher::get_is_done() const
   return st_ == e_done;
 }
 
-///////////////////////////////////////////////////////////////////////////
-// init_test
-
-init_test::init_test()
-: st_( e_create_sent )
-{
-}
-
-void init_test::set_lamports( uint64_t lamports )
-{
-  creq_->set_lamports( lamports );
-}
-
-key_pair *init_test::get_account()
-{
-  return &tkey_;
-}
-
-void init_test::submit()
-{
-  // get keys
-  manager *sptr = get_manager();
-  key_pair *pkey = sptr->get_publish_key_pair();
-  if ( !pkey ) {
-    on_error_sub( "missing or invalid publish key [" +
-        sptr->get_publish_key_pair_file(), this );
-    return;
-  }
-  pub_key *gpub = sptr->get_program_pub_key();
-  if ( !gpub ) {
-    on_error_sub( "missing or invalid program public key [" +
-        sptr->get_program_pub_key_file() + "]", this );
-    return;
-  }
-  manager *cptr = get_manager();
-  if ( !cptr->create_account_key_pair( tkey_ ) ) {
-    on_error_sub( "failed to create new test key_pair", this );
-    return;
-  }
-
-  creq_->set_sub( this );
-  creq_->set_sender( pkey );
-  creq_->set_account( &tkey_ );
-  creq_->set_owner( gpub );
-  creq_->set_space( sizeof( pc_price_t ) );
-
-  ireq_->set_sub( this );
-  ireq_->set_publish( pkey );
-  ireq_->set_account( &tkey_ );
-  ireq_->set_program( gpub );
-
-  sig_->set_sub( this );
-  sig_->set_commitment( commitment::e_finalized );
-
-  // get recent block hash and submit request
-  st_ = e_create_sent;
-  creq_->set_block_hash( cptr->get_recent_block_hash() );
-  get_rpc_client()->send( creq_ );
-}
-
-void init_test::on_response( rpc::create_account *res )
-{
-  if ( res->get_is_err() ) {
-    on_error_sub( res->get_err_msg(), this );
-    st_ = e_error;
-  } else if ( st_ == e_create_sent ) {
-    // subscribe to signature completion
-    st_ = e_create_sig;
-    sig_->set_commitment( commitment::e_finalized );
-    sig_->set_signature( res->get_signature() );
-    get_rpc_client()->send( sig_ );
-  }
-}
-
-void init_test::on_response( rpc::signature_subscribe *res )
-{
-  if ( res->get_is_err() ) {
-    on_error_sub( res->get_err_msg(), this );
-    st_ = e_error;
-  } else if ( st_ == e_create_sig ) {
-    st_ = e_init_sent;
-    ireq_->set_block_hash( get_manager()->get_recent_block_hash() );
-    get_rpc_client()->send( ireq_ );
-  } else if ( st_ == e_init_sig ) {
-    st_ = e_done;
-    on_response_sub( this );
-  }
-}
-
-void init_test::on_response( rpc::init_test *res )
-{
-  if ( res->get_is_err() ) {
-    on_error_sub( res->get_err_msg(), this );
-    st_ = e_error;
-  } else if ( st_ == e_init_sent ) {
-    st_ = e_init_sig;
-    sig_->set_signature( res->get_signature() );
-    get_rpc_client()->send( sig_ );
-  }
-}
-
-bool init_test::get_is_done() const
-{
-  return st_ == e_done;
-}
-
-///////////////////////////////////////////////////////////////////////////
-// upd_test
-
-void upd_test::set_test_key( const std::string& tkey )
-{
-  tpub_.init_from_text( tkey );
-}
-
-bool upd_test::init_from_file( const std::string& file )
-{
-  mem_map mf;
-  mf.set_file( file );
-  if ( !mf.init() ) {
-    return set_err_msg( "failed to read file[" + file + "]" );
-  }
-  jtree pt;
-  pt.parse( mf.data(), mf.size() );
-  if ( !pt.is_valid() ) {
-    return set_err_msg( "failed to parse file[" + file + "]" );
-  }
-  ureq_->set_expo( pt.get_int( pt.find_val( 1, "exponent" ) ) );
-  unsigned i=0, qt =pt.find_val( 1, "quotes" );
-  for( uint32_t it = pt.get_first( qt ); it; it = pt.get_next( it ) ) {
-    int64_t px = pt.get_int( pt.find_val( it,  "price"  ) );
-    uint64_t conf = pt.get_uint( pt.find_val( it, "conf" ) );
-    int64_t sdiff = pt.get_int( pt.find_val( it, "slot_diff" ) );
-    ureq_->set_price( i++, px, conf, sdiff );
-  }
-  ureq_->set_num( i );
-  return true;
-}
-
-bool upd_test::get_is_done() const
-{
-  return st_ == e_done;
-}
-
-void upd_test::submit()
-{
-  // get keys
-  manager *sptr = get_manager();
-  key_pair *pkey = sptr->get_publish_key_pair();
-  if ( !pkey ) {
-    on_error_sub( "missing or invalid publish key [" +
-        sptr->get_publish_key_pair_file(), this );
-    return;
-  }
-  pub_key *gpub = sptr->get_program_pub_key();
-  if ( !gpub ) {
-    on_error_sub( "missing or invalid program public key [" +
-        sptr->get_program_pub_key_file() + "]", this );
-    return;
-  }
-  manager *cptr = get_manager();
-  if ( !cptr->get_account_key_pair( tpub_, tkey_ ) ) {
-    on_error_sub( "failed to find test key_pair", this );
-    return;
-  }
-
-  ureq_->set_sub( this );
-  ureq_->set_publish( pkey );
-  ureq_->set_account( &tkey_ );
-  ureq_->set_program( gpub );
-
-  areq_->set_sub( this );
-  areq_->set_account( &tpub_ );
-  areq_->set_commitment( commitment::e_confirmed );
-  get_rpc_client()->send( areq_ );
-
-  // get recent block hash and submit request
-  st_ = e_upd_sent;
-  ureq_->set_block_hash( cptr->get_recent_block_hash() );
-  get_rpc_client()->send( ureq_ );
-}
-
-void upd_test::on_response( rpc::upd_test *res )
-{
-  if ( res->get_is_err() ) {
-    on_error_sub( res->get_err_msg(), this );
-    st_ = e_error;
-  }
-}
-
-void upd_test::on_response( rpc::account_subscribe *res )
-{
-  if ( res->get_is_err() ) {
-    on_error_sub( res->get_err_msg(), this );
-    st_ = e_error;
-    return;
-  }
-  manager *cptr = get_manager();
-  pc_price_t *tptr;
-  if ( sizeof( pc_price_t ) != res->get_data_ref( tptr ) ||
-       tptr->magic_ != PC_MAGIC ||
-       tptr->type_ != PC_ACCTYPE_TEST ) {
-    cptr->set_err_msg( "invalid or corrupt test account" );
-    st_ = e_error;
-    return;
-  }
-  if ( tptr->ver_ != PC_VERSION ) {
-    cptr->set_err_msg( "invalid test account version=" +
-        std::to_string( tptr->ver_ ) );
-    st_ = e_error;
-    return;
-  }
-  json_wtr jw;
-  jw.add_val( json_wtr::e_obj );
-  jw.add_key( "exponent", (int64_t)tptr->expo_ );
-  jw.add_key( "price", tptr->agg_.price_ );
-  jw.add_key( "conf", tptr->agg_.conf_ );
-  jw.pop();
-  net_buf *hd, *tl;
-  jw.detach( hd, tl );
-  while( hd ) {
-    net_buf *nxt = hd->next_;
-    std::cout.write( hd->buf_, hd->size_ );
-    hd = nxt;
-  }
-  std::cout << std::endl;
-  st_ = e_done;
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // get_minimum_balance_rent_exemption
 

pcapps/admin_request.hpp

@@ -319,70 +319,6 @@ namespace pc
     rpc::signature_subscribe sig_[1];
   };
 
-  // initialize test account
-  class init_test : public request,
-                    public rpc_sub_i<rpc::create_account>,
-                    public rpc_sub_i<rpc::init_test>,
-                    public rpc_sub_i<rpc::signature_subscribe>
-  {
-  public:
-    init_test();
-    void set_lamports( uint64_t );
-    bool get_is_done() const override;
-    key_pair *get_account();
-
-  public:
-    void submit() override;
-    void on_response( rpc::create_account * ) override;
-    void on_response( rpc::init_test * ) override;
-    void on_response( rpc::signature_subscribe * ) override;
-
-  private:
-    using request::on_response;
-
-    typedef enum {
-      e_create_sent, e_create_sig,
-      e_init_sent, e_init_sig, e_done, e_error
-    } state_t;
-
-    state_t                  st_;
-    key_pair                 tkey_;
-    rpc::create_account      creq_[1];
-    rpc::init_test           ireq_[1];
-    rpc::signature_subscribe sig_[1];
-  };
-
-  // run aggregate price test
-  class upd_test : public request,
-                   public rpc_sub_i<rpc::upd_test>,
-                   public rpc_sub_i<rpc::account_subscribe>
-  {
-  public:
-    void set_test_key( const std::string& );
-    bool init_from_file( const std::string& );
-    bool get_is_done() const override;
-
-  public:
-
-    void submit() override;
-    void on_response( rpc::upd_test * ) override;
-    void on_response( rpc::account_subscribe * ) override;
-
-  private:
-    using request::on_response;
-
-    typedef enum {
-      e_upd_sent, e_upd_sig, e_get_sent, e_done, e_error
-    } state_t;
-
-    state_t                  st_;
-    pub_key                  tpub_;
-    key_pair                 tkey_;
-    rpc::create_account      creq_[1];
-    rpc::upd_test            ureq_[1];
-    rpc::account_subscribe   areq_[1];
-  };
-
   // get minimum balance for rent exemption
   class get_minimum_balance_rent_exemption : public request,
     public rpc_sub_i<rpc::get_minimum_balance_rent_exemption>