test

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index d7377a3b647b83c89e0a7bc9d53834e4fb1a5c6e..4ecf4b97c30347076f13d4cd55c95bf92e36af22 100644 (file)
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -221,7 +221,7 @@ try_again:
             free(s.ptr);
             return(0);
         }
-        else if ( numretries >= 6 )
+        else if ( numretries >= 1 )
         {
             printf("Maximum number of retries exceeded!\n");
             free(s.ptr);

diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 02b9b8fc6971c4b9024dc7a52f491d05ff8f8db1..d75089704b9f4ae9742bd4720267bcc0e2c5ab45 100644 (file)
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -35,9 +35,9 @@ void komodo_gateway_voutupdate(char *symbol,int32_t height,int32_t txi,int32_t v
     printf("%s VOUTUPDATE.%d txi.%d vout.%d %.8f scriptlen.%d OP_RETURN.%d (%s)\n",symbol,height,txi,vout,dstr(value),len,script[0] == 0x6a,typestr);
 }
 
-void komodo_gateway_tx(char *symbol,int32_t height,int32_t txi,char *txidstr,uint32_t port)
+int32_t komodo_gateway_tx(char *symbol,int32_t height,int32_t txi,char *txidstr,uint32_t port)
 {
-    char *retstr,params[256],*hexstr; uint8_t script[10000]; cJSON *json,*result,*vouts,*item,*sobj; int32_t vout,n,len,isspecial; uint64_t value;
+    char *retstr,params[256],*hexstr; uint8_t script[10000]; cJSON *json,*result,*vouts,*item,*sobj; int32_t vout,n,len,isspecial,retval = -1; uint64_t value;
     sprintf(params,"[\"%s\", 1]",txidstr);
     if ( (retstr= komodo_issuemethod((char *)"getrawtransaction",params,port)) != 0 )
     {
@@ -45,6 +45,7 @@ void komodo_gateway_tx(char *symbol,int32_t height,int32_t txi,char *txidstr,uin
         {
             if ( (result= jobj(json,(char *)"result")) != 0 && (vouts= jarray(&n,result,(char *)"vout")) != 0 )
             {
+                retval = 0;
                 isspecial = 0;
                 for (vout=0; vout<n; vout++)
                 {
@@ -70,11 +71,12 @@ void komodo_gateway_tx(char *symbol,int32_t height,int32_t txi,char *txidstr,uin
         }
         free(retstr);
     }
+    return(retval);
 }
 
-void komodo_gateway_block(char *symbol,int32_t height,uint16_t port)
+int32_t komodo_gateway_block(char *symbol,int32_t height,uint16_t port)
 {
-    char *retstr,*retstr2,params[128],*txidstr; int32_t i,n; cJSON *json,*tx,*result,*result2;
+    char *retstr,*retstr2,params[128],*txidstr; int32_t i,n,retval = -1; cJSON *json,*tx,*result,*result2;
     sprintf(params,"[%d]",height);
     if ( (retstr= komodo_issuemethod((char *)"getblockhash",params,port)) != 0 )
     {
@@ -91,7 +93,10 @@ void komodo_gateway_block(char *symbol,int32_t height,uint16_t port)
                         if ( (result2= jobj(json,(char *)"result")) != 0 && (tx= jarray(&n,result2,(char *)"tx")) != 0 )
                         {
                             for (i=0; i<n; i++)
-                                komodo_gateway_tx(symbol,height,i,jstri(tx,i),port);
+                                if ( komodo_gateway_tx(symbol,height,i,jstri(tx,i),port) < 0 )
+                                    break;
+                            if ( i == n )
+                                retval = 0;
                         }
                         free_json(json);
                     }
@@ -102,6 +107,7 @@ void komodo_gateway_block(char *symbol,int32_t height,uint16_t port)
         }
         free(retstr);
     }
+    return(retval);
 }
 
 void komodo_gateway_iteration(char *symbol)
@@ -113,11 +119,12 @@ void komodo_gateway_iteration(char *symbol)
         {
             if ( (result= jobj(infoobj,(char *)"result")) != 0 && (kmdheight= jint(result,(char *)"blocks")) != 0 )
             {
-                for (i=0; i<100 && KMDHEIGHT<kmdheight; i++,KMDHEIGHT++)
+                for (i=0; i<10 && KMDHEIGHT<kmdheight; i++,KMDHEIGHT++)
                 {
-                    if ( (KMDHEIGHT % 1000) == 0 )
+                    if ( (KMDHEIGHT % 100) == 0 )
                         fprintf(stderr,"%s.%d ",symbol,KMDHEIGHT);
-                    komodo_gateway_block(symbol,KMDHEIGHT,port);
+                    if ( komodo_gateway_block(symbol,KMDHEIGHT,port) < 0 )
+                        break;
                     usleep(10000);
                 }
             }

diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 8832fa27064200e5f3bc2c2c3f6656f2ad4101f3..8b72e6986c7abb578f70962ce9fd0247e780cb20 100644 (file)
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -753,7 +753,7 @@ void StartRPCThreads()
     g_rpcSignals.Started();
 
     // Launch one async rpc worker.  The ability to launch multiple workers is not recommended at present and thus the option is disabled.
-    for (int i=0; i<32; i++)
+    //for (int i=0; i<32; i++)
         getAsyncRPCQueue()->addWorker();
 /*   
     int n = GetArg("-rpcasyncthreads", 1);