From b409120689bc97deedf2971b214438fb7f0e4fbf Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 2 Aug 2016 09:17:31 -0300
Subject: [PATCH] test

---
 basilisk/basilisk.c      |  4 ++--
 basilisk/basilisk_MSG.c  |  2 +-
 basilisk/basilisk_swap.c | 24 ++++++++++++++----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c
index 87b619676..1582f4a41 100755
--- a/basilisk/basilisk.c
+++ b/basilisk/basilisk.c
@@ -254,7 +254,7 @@ int32_t basilisk_sendcmd(struct supernet_info *myinfo,char *destipaddr,char *typ
 void basilisk_sendback(struct supernet_info *myinfo,char *origCMD,char *symbol,char *remoteaddr,uint32_t basilisktag,char *retstr)
 {
     uint8_t *data,space[4096],*allocptr; struct iguana_info *virt; cJSON *valsobj; int32_t datalen,encryptflag=0,delaymillis=0;
-    printf("%s retstr.(%s) -> remote.(%s) basilisktag.%u\n",origCMD,retstr,remoteaddr,basilisktag);
+    //printf("%s retstr.(%s) -> remote.(%s) basilisktag.%u\n",origCMD,retstr,remoteaddr,basilisktag);
     if ( retstr != 0 && remoteaddr != 0 && remoteaddr[0] != 0 && strcmp(remoteaddr,"127.0.0.1") != 0 )
     {
         if ( (valsobj= cJSON_Parse(retstr)) != 0 )
@@ -269,7 +269,7 @@ void basilisk_sendback(struct supernet_info *myinfo,char *origCMD,char *symbol,c
                 jaddbits256(valsobj,"chaintip",virt->blocks.hwmchain.RO.hash2);
             }
             data = basilisk_jsondata(sizeof(struct iguana_msghdr),&allocptr,space,sizeof(space),&datalen,symbol,valsobj,basilisktag);
-            printf("sendback.%d -> %s\n",datalen,remoteaddr);
+            //printf("sendback.%d -> %s\n",datalen,remoteaddr);
             basilisk_sendcmd(myinfo,remoteaddr,"RET",&basilisktag,encryptflag,delaymillis,data,datalen,0,0);
             if ( allocptr != 0 )
                 free(allocptr);
diff --git a/basilisk/basilisk_MSG.c b/basilisk/basilisk_MSG.c
index 9e8374463..3ec4185b6 100755
--- a/basilisk/basilisk_MSG.c
+++ b/basilisk/basilisk_MSG.c
@@ -112,7 +112,7 @@ char *basilisk_respond_getmessage(struct supernet_info *myinfo,uint8_t *key,int3
         {
             jadd(retjson,"message",msgjson);
             jaddstr(retjson,"result","success");
-            printf("havemessage len.%d\n",msg->datalen);
+            //printf("havemessage len.%d\n",msg->datalen);
         } else jaddstr(retjson,"error","couldnt add message");
     } else jaddstr(retjson,"error","no message");
     portable_mutex_unlock(&myinfo->messagemutex);
diff --git a/basilisk/basilisk_swap.c b/basilisk/basilisk_swap.c
index 6c9b88d3c..fa963961f 100755
--- a/basilisk/basilisk_swap.c
+++ b/basilisk/basilisk_swap.c
@@ -116,9 +116,19 @@ int32_t basilisk_alicescript(uint8_t *script,int32_t n,char *msigaddr,uint8_t al
     return(n);
 }
 
+int32_t basilisk_confirmsobj(cJSON *item)
+{
+    int32_t height,numconfirms;
+    height = jint(item,"height");
+    numconfirms = jint(item,"numconfirms");
+    if ( height > 0 && numconfirms >= 0 )
+        return(numconfirms);
+    return(-1);
+}
+
 int32_t basilisk_numconfirms(struct supernet_info *myinfo,struct basilisk_rawtx *rawtx)
 {
-    cJSON *argjson,*valuearray=0,*item; char *valstr; int32_t numconfirms,height,i,n,retval = -1;
+    cJSON *argjson,*valuearray=0; char *valstr; int32_t i,n,retval = -1;
 #ifdef BASILISK_DISABLETX
     return(10);
 #endif
@@ -136,17 +146,10 @@ int32_t basilisk_numconfirms(struct supernet_info *myinfo,struct basilisk_rawtx
                 n = cJSON_GetArraySize(valuearray);
                 for (i=0; i<n; i++)
                 {
-                    item = jitem(valuearray,i);
-                    height = jint(item,"height");
-                    numconfirms = jint(item,"numconfirms");
-                    char str[65]; printf("i.%d of %d: %s height.%d -> numconfirms.%d\n",i,n,bits256_str(str,rawtx->actualtxid),height,numconfirms);
-                    if ( height > 0 && numconfirms >= 0 )
-                    {
-                        retval = numconfirms;
+                    if ( (retval= basilisk_confirmsobj(jitem(valuearray,i))) >= 0 )
                         break;
-                    }
                }
-            } else printf("valstr not array\n");
+            } else retval = basilisk_confirmsobj(valuearray);
             free_json(valuearray);
         } else printf("parse error\n");
         free(valstr);
@@ -1134,6 +1137,7 @@ void basilisk_swaploop(void *_swap)
     }
     while ( retval == 0 && time(NULL) < swap->expiration )  // both sides have setup required data and paid txfee
     {
+        printf("E r%u/q%u swapstate.%x otherstate.%x\n",swap->req.requestid,swap->req.quoteid,swap->statebits,swap->otherstatebits);
         if ( swap->iambob != 0 )
         {
             if ( (swap->statebits & 0x100) == 0 )