remove version override

Author: richardbrooks2000

pc/manager.cpp

@@ -39,7 +39,6 @@ manager::manager()
 : sub_( nullptr ),
   status_( 0 ),
   num_sub_( 0 ),
-  version_( PC_VERSION ),
   kidx_( (unsigned)-1 ),
   cts_( 0L ),
   ctimeout_( PC_NSECS_IN_SEC ),
@@ -136,16 +135,6 @@ int manager::get_listen_port() const
   return lsvr_.get_port();
 }
 
-void manager::set_version( uint32_t version )
-{
-  version_ = version;
-}
-
-uint32_t manager::get_version() const
-{
-  return version_;
-}
-
 void manager::set_content_dir( const std::string& cdir )
 {
   cdir_ = cdir;
@@ -262,7 +251,7 @@ bool manager::init()
       .end();
   }
   PC_LOG_INF( "initialized" )
-    .add( "version", version_ )
+    .add( "version", PC_VERSION )
     .add( "capture_file", get_capture_file() )
     .add( "publish_interval(ms)", get_publish_interval() )
     .end();

pc/manager.hpp

@@ -57,10 +57,6 @@ namespace pc
     void set_listen_port( int port );
     int get_listen_port() const;
 
-    // server subscription version
-    void set_version( uint32_t );
-    uint32_t get_version() const;
-
     // content directory (for http content requests if running as server)
     void set_content_dir( const std::string& );
     std::string get_content_dir() const;
@@ -191,7 +187,6 @@ namespace pc
     manager_sub *sub_;      // subscription callback
     int          status_;   // status bitmap
     int          num_sub_;  // number of in-flight mapping subscriptions
-    uint32_t     version_;  // account version subscription
     uint32_t     kidx_;     // schedule index
     int64_t      cts_;      // (re)connect timestamp
     int64_t      ctimeout_; // connection timeout

pcapps/pyth.cpp

@@ -675,15 +675,13 @@ int on_upd_price( int argc, char **argv )
   argv += 1;
 
   int opt = 0;
-  uint32_t version = PC_VERSION;
   std::string rpc_host = get_rpc_host();
   std::string key_dir  = get_key_store();
-  while( (opt = ::getopt(argc,argv, "r:k:c:v:dh" )) != -1 ) {
+  while( (opt = ::getopt(argc,argv, "r:k:c:dh" )) != -1 ) {
     switch(opt) {
       case 'r': rpc_host = optarg; break;
       case 'k': key_dir = optarg; break;
       case 'd': log::set_level( PC_LOG_DBG_LVL ); break;
-      case 'v': version = ::atoi( optarg ); break;
       case 'c': break;
       default: return usage();
     }
@@ -693,7 +691,6 @@ int on_upd_price( int argc, char **argv )
   manager mgr;
   mgr.set_rpc_host( rpc_host );
   mgr.set_dir( key_dir );
-  mgr.set_version( version );
   if ( !mgr.init() || !mgr.bootstrap() ) {
     std::cerr << "pyth: " << mgr.get_err_msg() << std::endl;
     return 1;
@@ -827,15 +824,13 @@ int on_get_pub_key( int argc, char **argv )
 int on_get_product_list( int argc, char **argv )
 {
   int opt = 0;
-  uint32_t version = PC_VERSION;
   std::string rpc_host = get_rpc_host();
   std::string key_dir  = get_key_store();
-  while( (opt = ::getopt(argc,argv, "r:k:c:v:dh" )) != -1 ) {
+  while( (opt = ::getopt(argc,argv, "r:k:c:dh" )) != -1 ) {
     switch(opt) {
       case 'r': rpc_host = optarg; break;
       case 'k': key_dir = optarg; break;
       case 'd': log::set_level( PC_LOG_DBG_LVL ); break;
-      case 'v': version = ::atoi( optarg ); break;
       case 'c': break;
       default: return usage();
     }
@@ -845,7 +840,6 @@ int on_get_product_list( int argc, char **argv )
   manager mgr;
   mgr.set_rpc_host( rpc_host );
   mgr.set_dir( key_dir );
-  mgr.set_version( version );
   if ( !mgr.init() || !mgr.bootstrap() ) {
     std::cerr << "pyth: " << mgr.get_err_msg() << std::endl;
     return 1;
@@ -874,15 +868,13 @@ int on_get_product( int argc, char **argv )
   argv += 1;
 
   int opt = 0;
-  uint32_t version = PC_VERSION;
   std::string rpc_host = get_rpc_host();
   std::string key_dir  = get_key_store();
-  while( (opt = ::getopt(argc,argv, "r:k:c:v:dh" )) != -1 ) {
+  while( (opt = ::getopt(argc,argv, "r:k:c:dh" )) != -1 ) {
     switch(opt) {
       case 'r': rpc_host = optarg; break;
       case 'k': key_dir = optarg; break;
       case 'd': log::set_level( PC_LOG_DBG_LVL ); break;
-      case 'v': version = ::atoi( optarg ); break;
       case 'c': break;
       default: return usage();
     }
@@ -892,7 +884,6 @@ int on_get_product( int argc, char **argv )
   manager mgr;
   mgr.set_rpc_host( rpc_host );
   mgr.set_dir( key_dir );
-  mgr.set_version( version );
   if ( !mgr.init() || !mgr.bootstrap() ) {
     std::cerr << "pyth: " << mgr.get_err_msg() << std::endl;
     return 1;

pcapps/pythd.cpp

@@ -37,7 +37,6 @@ int usage()
   std::cerr << "  -w <web content directory>" << std::endl;
   std::cerr << "  -c <capture file>" << std::endl;
   std::cerr << "  -l <log_file>" << std::endl;
-  std::cerr << "  -v <version>" << std::endl;
   std::cerr << "  -n" << std::endl;
   std::cerr << "  -d" << std::endl;
   return 1;
@@ -66,19 +65,17 @@ int main(int argc, char **argv)
   std::string cnt_dir, cap_file, log_file;
   std::string rpc_host = get_rpc_host();
   std::string key_dir  = get_key_store();
-  uint32_t version = PC_VERSION;
   int pyth_port = get_port();
   int opt = 0;
   bool do_wait = true, do_debug = false;
-  while( (opt = ::getopt(argc,argv, "r:p:k:w:c:l:v:dnh" )) != -1 ) {
+  while( (opt = ::getopt(argc,argv, "r:p:k:w:c:l:dnh" )) != -1 ) {
     switch(opt) {
       case 'r': rpc_host = optarg; break;
       case 'p': pyth_port = ::atoi(optarg); break;
       case 'k': key_dir = optarg; break;
       case 'c': cap_file = optarg; break;
       case 'w': cnt_dir = optarg; break;
       case 'l': log_file = optarg; break;
-      case 'v': version = ::atoi( optarg ); break;
       case 'n': do_wait = false; break;
       case 'd': do_debug = true; break;
       default: return usage();
@@ -99,7 +96,6 @@ int main(int argc, char **argv)
   mgr.set_dir( key_dir );
   mgr.set_rpc_host( rpc_host );
   mgr.set_listen_port( pyth_port );
-  mgr.set_version( version );
   mgr.set_content_dir( cnt_dir );
   mgr.set_capture_file( cap_file );
   mgr.set_do_capture( !cap_file.empty() );