test

basilisk/basilisk.c

@@ -723,7 +723,7 @@ double basilisk_request_listprocess(struct supernet_info *myinfo,struct basilisk
     int32_t i,noquoteflag=0,havequoteflag=0,myrequest=0,maxi=-1; uint64_t destamount,minamount = 0,maxamount = 0; uint32_t pendingid=0; struct basilisk_swap *active; double metric = 0.;
     memset(issueR,0,sizeof(*issueR));
     minamount = list[0].minamount;
-    printf("need to verify null quoteid is list[0] requestid.%u quoteid.%u\n",list[0].requestid,list[0].quoteid);
+    //printf("need to verify null quoteid is list[0] requestid.%u quoteid.%u\n",list[0].requestid,list[0].quoteid);
     if ( (active= basilisk_request_started(myinfo,list[0].requestid)) != 0 )
         pendingid = active->req.quoteid;
     if ( bits256_cmp(myinfo->myaddr.persistent,list[0].hash) == 0 ) // my request
@@ -750,7 +750,7 @@ double basilisk_request_listprocess(struct supernet_info *myinfo,struct basilisk
             }
         } else noquoteflag++;
     }
-    printf("myrequest.%d pendingid.%u noquoteflag.%d havequoteflag.%d maxi.%d %.8f\n",myrequest,pendingid,noquoteflag,havequoteflag,maxi,dstr(maxamount));
+    //printf("myrequest.%d pendingid.%u noquoteflag.%d havequoteflag.%d maxi.%d %.8f\n",myrequest,pendingid,noquoteflag,havequoteflag,maxi,dstr(maxamount));
     if ( myrequest == 0 && pendingid == 0 && noquoteflag != 0 )
     {
         double retvals[4],aveprice;

basilisk/basilisk_swap.c

@@ -534,32 +534,25 @@ void basilisk_swaploop(void *_swap)
         fprintf(stderr,"swapstate.%x\n",swap->statebits);
         if ( (swap->statebits & 0x01) == 0 ) // wait for pubkeys
         {
-            printf("call swapget\n");
             if ( basilisk_swapget(myinfo,swap,0x01,data,maxlen,basilisk_verify_otherdeck) == 0 )
                 swap->statebits |= 0x01;
-            printf("call swapget: state.%d\n",swap->statebits);
         }
         else if ( (swap->statebits & 0x02) == 0 ) // send pubkeys
         {
             datalen = basilisk_swapdata_deck(myinfo,swap,data,maxlen);
             swap->statebits |= basilisk_swapsend(myinfo,swap,0x01,data,datalen,0x02);
         }
-        else if ( (swap->statebits & 0x04) == 0 ) // wait for choosei
-        {
-            if ( basilisk_swapget(myinfo,swap,0x04,data,maxlen,basilisk_verify_choosei) == 0 )
-                swap->statebits |= 0x04;
-        }
-        else if ( (swap->statebits & 0x08) == 0 ) // send choosei
+        else if ( (swap->statebits & 0x04) == 0 ) // send choosei
         {
             iguana_rwnum(1,data,sizeof(swap->choosei),&swap->choosei);
             swap->statebits |= basilisk_swapsend(myinfo,swap,0x04,data,datalen,0x08);
         }
-        else if ( (swap->statebits & 0x10) == 0 ) // wait for all but one privkeys
+        else if ( (swap->statebits & 0x08) == 0 ) // wait for choosei
         {
-            if ( basilisk_swapget(myinfo,swap,0x10,data,maxlen,basilisk_verify_privkeys) == 0 )
-                swap->statebits |= 0x10;
+            if ( basilisk_swapget(myinfo,swap,0x04,data,maxlen,basilisk_verify_choosei) == 0 )
+                swap->statebits |= 0x04;
         }
-        else if ( (swap->statebits & 0x20) == 0 ) // send all but one privkeys
+        else if ( (swap->statebits & 0x10) == 0 ) // send all but one privkeys
         {
             for (i=0; i<INSTANTDEX_DECKSIZE; i++)
             {
@@ -568,6 +561,11 @@ void basilisk_swaploop(void *_swap)
             }
             swap->statebits |= basilisk_swapsend(myinfo,swap,0x10,data,datalen,0x20);
         }
+        else if ( (swap->statebits & 0x20) == 0 ) // wait for all but one privkeys
+        {
+            if ( basilisk_swapget(myinfo,swap,0x10,data,maxlen,basilisk_verify_privkeys) == 0 )
+                swap->statebits |= 0x10;
+        }
         else if ( (swap->statebits & 0x40) == 0 ) // send fee
             swap->statebits |= basilisk_swapdata_rawtxsend(myinfo,swap,0x80,data,maxlen,&swap->myfee,0x40);
         else if ( (swap->statebits & 0x80) == 0 ) // wait for fee