Test

iguana/exchanges/LP_remember.c

@@ -1256,38 +1256,6 @@ char *basilisk_swapentry(uint32_t requestid,uint32_t quoteid)
     return(retstr);
 }
 
-char *basilisk_swapentries(char *refbase,char *refrel)
-{
-    char *liststr,*base,*rel; cJSON *retjson,*array,*item,*retarray; int32_t i,n;
-    retarray = cJSON_CreateArray();
-    if ( (liststr= basilisk_swaplist(0,0)) != 0 )
-    {
-        //printf("swapentry.(%s)\n",liststr);
-        if ( (retjson= cJSON_Parse(liststr)) != 0 )
-        {
-            if ( (array= jarray(&n,retjson,"swaps")) != 0 )
-            {
-                for (i=0; i<n; i++)
-                {
-                    item = jitem(array,i);
-                    base = jstr(item,"bob");
-                    rel = jstr(item,"alice");
-                    if ( refrel == 0 || refrel[0] == 0 )
-                    {
-                        if ( strcmp(base,refbase) == 0 || strcmp(rel,refbase) == 0 )
-                            jaddi(retarray,item);
-                    }
-                    else if ( strcmp(base,refbase) == 0 && strcmp(rel,refrel) == 0 )
-                        jaddi(retarray,item);
-                }
-            }
-            free_json(retjson);
-        }
-        free(liststr);
-    }
-    return(jprint(retarray,1));
-}
-
 extern struct LP_quoteinfo LP_Alicequery;
 extern uint32_t Alice_expiration;
 
@@ -1337,3 +1305,42 @@ char *LP_recent_swaps(int32_t limit)
     } else Alice_expiration = 0;
     return(jprint(retjson,1));
 }
+
+void basilisk_swap_addarray(cJSON *array,cJSON *item,char *refbase,char *refrel)
+{
+    char *base,*rel;
+    base = jstr(item,"bob");
+    rel = jstr(item,"alice");
+    if ( refrel == 0 || refrel[0] == 0 )
+    {
+        if ( strcmp(base,refbase) == 0 || strcmp(rel,refbase) == 0 )
+            jaddi(array,item);
+    }
+    else if ( strcmp(base,refbase) == 0 && strcmp(rel,refrel) == 0 )
+        jaddi(array,item);
+}
+
+char *basilisk_swapentries(char *refbase,char *refrel)
+{
+    char *liststr; cJSON *retjson,*array,*item,*retarray; int32_t i,n;
+    retarray = cJSON_CreateArray();
+    if ( (liststr= basilisk_swaplist(0,0)) != 0 )
+    {
+        //printf("swapentry.(%s)\n",liststr);
+        if ( (retjson= cJSON_Parse(liststr)) != 0 )
+        {
+            if ( (array= jarray(&n,retjson,"swaps")) != 0 )
+            {
+                for (i=0; i<n; i++)
+                {
+                    item = jitem(array,i);
+                    basilisk_swap_addarray(retarray,item,refbase,refrel);
+                }
+            }
+            free_json(retjson);
+        }
+        free(liststr);
+    }
+    return(jprint(retarray,1));
+}
+

iguana/exchanges/LP_utxos.c

@@ -782,7 +782,7 @@ int32_t LP_passphrase_init(char *passphrase,char *gui)
             HASH_ITER(hh,G.LP_utxoinfos[iambob],utxo,tmp)
             {
                 HASH_DELETE(hh,G.LP_utxoinfos[iambob],utxo);
-                free(utxo);
+                //free(utxo);
             }
         }
         if ( G.LP_utxoinfos2[iambob] != 0 )