Browse Source

Test

etomic
jl777 7 years ago
parent
commit
f1cbd668fd
  1. 13
      iguana/exchanges/LP_commands.c
  2. 3
      iguana/exchanges/LP_ordermatch.c

13
iguana/exchanges/LP_commands.c

@ -109,7 +109,6 @@ myprice(base, rel)\n\
enable(coin)\n\
disable(coin)\n\
notarizations(coin)\n\
parselog()\n\
statsdisp(starttime=0, endtime=0, gui="", pubkey="", base="", rel="")\n\
tradesarray(base, rel, starttime=<now>-timescale*1024, endtime=<now>, timescale=60) -> [timestamp, high, low, open, close, relvolume, basevolume, aveprice, numtrades]\n\
pricearray(base, rel, starttime=0, endtime=0, timescale=60) -> [timestamp, avebid, aveask, highbid, lowask]\n\
@ -269,12 +268,6 @@ zeroconf_claim(address, expiration=0)\n\
{
return(LP_portfolio());
}
else if ( strcmp(method,"parselog") == 0 )
{
bits256 zero;
memset(zero.bytes,0,sizeof(zero));
return(jprint(LP_statslog_disp(2000000000,2000000000,"",zero,0,0),1));
}
else if ( strcmp(method,"statsdisp") == 0 )
{
return(jprint(LP_statslog_disp(juint(argjson,"starttime"),juint(argjson,"endtime"),jstr(argjson,"gui"),jbits256(argjson,"pubkey"),jstr(argjson,"base"),jstr(argjson,"rel")),1));
@ -636,12 +629,6 @@ zeroconf_claim(address, expiration=0)\n\
LP_quoteparse(&Q,argjson);
LP_requestinit(&Q.R,Q.srchash,Q.desthash,Q.srccoin,Q.satoshis-Q.txfee,Q.destcoin,Q.destsatoshis-Q.desttxfee,Q.timestamp,Q.quotetime,0);
LP_tradecommand_log(argjson);
if ( LP_statslog_parse() > 0 )
{
memset(zero.bytes,0,sizeof(zero));
if ( (tmpjson= LP_statslog_disp(2000000000,2000000000,"",zero,0,0))) // pending swaps
free_json(tmpjson);
}
printf("%-4d (%-10u %10u) %12s id.%22llu %5s/%-5s %12.8f -> %11.8f price %11.8f | RT.%d %d\n",(uint32_t)time(NULL) % 3600,Q.R.requestid,Q.R.quoteid,method,(long long)Q.aliceid,Q.srccoin,Q.destcoin,dstr(Q.satoshis),dstr(Q.destsatoshis),(double)Q.destsatoshis/Q.satoshis,LP_RTcount,LP_swapscount);
retstr = clonestr("{\"result\":\"success\"}");
}

3
iguana/exchanges/LP_ordermatch.c

@ -495,11 +495,8 @@ int32_t LP_connectstartbob(void *ctx,int32_t pubsock,cJSON *argjson,char *base,c
LP_reserved_msg(1,base,rel,qp->desthash,jprint(retjson,0));
bits256 zero;
memset(zero.bytes,0,sizeof(zero));
sleep(1);
LP_reserved_msg(1,base,rel,zero,jprint(retjson,0));
LP_reserved_msg(0,base,rel,zero,jprint(retjson,0));
sleep(1);
LP_reserved_msg(0,base,rel,zero,jprint(retjson,0));
free_json(retjson);
retval = 0;
} else printf("error launching swaploop\n");

Loading…
Cancel
Save