Browse Source

Test

etomic
jl777 8 years ago
parent
commit
ab503df182
  1. 14
      iguana/exchanges/LP_quotes.c
  2. 2
      iguana/exchanges/LP_utxos.c

14
iguana/exchanges/LP_quotes.c

@ -198,14 +198,16 @@ int32_t LP_arrayfind(cJSON *array,bits256 txid,int32_t vout)
cJSON *LP_tradecandidates(struct LP_utxoinfo *myutxo,char *base) cJSON *LP_tradecandidates(struct LP_utxoinfo *myutxo,char *base)
{ {
struct LP_peerinfo *peer,*tmp; struct LP_quoteinfo Q; char *utxostr,coinstr[16]; cJSON *array,*retarray=0,*item; int32_t i,n; double price; struct LP_peerinfo *peer,*tmp; struct LP_quoteinfo Q; char *utxostr,coinstr[16]; cJSON *array,*retarray=0,*item; int32_t i,n,totaladded,added; double price;
if ( (price= LP_price(base,myutxo->coin)) == .0 ) if ( (price= LP_price(base,myutxo->coin)) == .0 )
{ {
printf("no LP_price (%s -> %s)\n",base,myutxo->coin); printf("no LP_price (%s -> %s)\n",base,myutxo->coin);
return(0); return(0);
} }
totaladded = 0;
HASH_ITER(hh,LP_peerinfos,peer,tmp) HASH_ITER(hh,LP_peerinfos,peer,tmp)
{ {
n = 0;
if ( (utxostr= issue_LP_clientgetutxos(peer->ipaddr,peer->port,base,100)) != 0 ) if ( (utxostr= issue_LP_clientgetutxos(peer->ipaddr,peer->port,base,100)) != 0 )
{ {
//printf("%s:%u %s %s\n",peer->ipaddr,peer->port,base,utxostr); //printf("%s:%u %s %s\n",peer->ipaddr,peer->port,base,utxostr);
@ -214,6 +216,7 @@ cJSON *LP_tradecandidates(struct LP_utxoinfo *myutxo,char *base)
if ( is_cJSON_Array(array) != 0 && (n= cJSON_GetArraySize(array)) > 0 ) if ( is_cJSON_Array(array) != 0 && (n= cJSON_GetArraySize(array)) > 0 )
{ {
retarray = cJSON_CreateArray(); retarray = cJSON_CreateArray();
added = 0;
for (i=0; i<n; i++) for (i=0; i<n; i++)
{ {
item = jitem(array,i); item = jitem(array,i);
@ -224,7 +227,11 @@ cJSON *LP_tradecandidates(struct LP_utxoinfo *myutxo,char *base)
if ( LP_iseligible(Q.srccoin,Q.txid,Q.vout,Q.satoshis,Q.txid2,Q.vout2) != 0 ) if ( LP_iseligible(Q.srccoin,Q.txid,Q.vout,Q.satoshis,Q.txid2,Q.vout2) != 0 )
{ {
if ( LP_arrayfind(retarray,Q.txid,Q.vout) < 0 ) if ( LP_arrayfind(retarray,Q.txid,Q.vout) < 0 )
{
jaddi(retarray,jduplicate(item)); jaddi(retarray,jduplicate(item));
added++;
totaladded++;
}
} else printf("ineligible.(%s)\n",jprint(item,0)); } else printf("ineligible.(%s)\n",jprint(item,0));
} }
} }
@ -233,6 +240,11 @@ cJSON *LP_tradecandidates(struct LP_utxoinfo *myutxo,char *base)
} }
free(utxostr); free(utxostr);
} }
if ( n == totaladded && added == 0 )
{
printf("n.%d totaladded.%d vs added.%d\n",n,totaladded,added);
break;
}
} }
return(retarray); return(retarray);
} }

2
iguana/exchanges/LP_utxos.c

@ -95,7 +95,7 @@ char *LP_utxos(struct LP_peerinfo *mypeer,char *coin,int32_t lastn)
{ {
if ( i++ < firsti ) if ( i++ < firsti )
continue; continue;
if ( (coin == 0 || coin[0] == 0 || strcmp(coin,utxo->coin) == 0) && LP_ismine(utxo) != 0 ) if ( (coin == 0 || coin[0] == 0 || strcmp(coin,utxo->coin) == 0) )//&& LP_ismine(utxo) != 0 )
{ {
jaddi(utxosjson,LP_utxojson(utxo)); jaddi(utxosjson,LP_utxojson(utxo));
} }

Loading…
Cancel
Save