From cfe6e0a1e68da25e39e49061bd731050a204dc5a Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 8 May 2017 12:59:55 +0300 Subject: [PATCH] Test --- iguana/exchanges/DEXstats.h | 8 +++++--- iguana/tests/dexlisttransactions | 2 +- iguana/tests/statstest | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/iguana/exchanges/DEXstats.h b/iguana/exchanges/DEXstats.h index 09f0a639f..df145ae15 100644 --- a/iguana/exchanges/DEXstats.h +++ b/iguana/exchanges/DEXstats.h @@ -902,7 +902,7 @@ char *stats_prices(char *symbol,char *dest,struct DEXstats_disp *prices,int32_t char *stats_JSON(cJSON *argjson,char *remoteaddr,uint16_t port) { - char *method,*agent,*retstr,*source,*dest; struct tai T; uint32_t endtimestamp; struct DEXstats_disp prices[365]; int32_t leftdatenum,seconds,width = 1024; + char *method,*agent,*retstr,*source,*dest; struct tai T; uint32_t endtimestamp; struct DEXstats_disp prices[365]; int32_t leftdatenum,seconds,numdates; if ( (method= jstr(argjson,"method")) == 0 ) return(clonestr("{\"error\":\"need method in request\"}")); if ( (agent= jstr(argjson,"agent")) == 0 ) @@ -915,10 +915,12 @@ char *stats_JSON(cJSON *argjson,char *remoteaddr,uint16_t port) source = "KMD"; if ( (dest= jstr(argjson,"dest")) == 0 ) dest = "USD"; - leftdatenum = OS_conv_unixtime(&T,&seconds,endtimestamp - width*3600); + if ( (numdates= jstr(argjson,"numdates")) == 0 ) + numdates = 1024/24; + leftdatenum = OS_conv_unixtime(&T,&seconds,endtimestamp - numdates*24*3600); printf("(%s/%s) endtimestamp.%u: leftdatenum.%d\n",source,dest,endtimestamp,leftdatenum); memset(prices,0,sizeof(prices)); - if ( (retstr= stats_prices(source,dest,prices,leftdatenum,width/24+1)) != 0 ) + if ( (retstr= stats_prices(source,dest,prices,leftdatenum,numdates+1)) != 0 ) return(retstr); } return(clonestr(jprint(argjson,0))); diff --git a/iguana/tests/dexlisttransactions b/iguana/tests/dexlisttransactions index c12c56d96..09a94f406 100755 --- a/iguana/tests/dexlisttransactions +++ b/iguana/tests/dexlisttransactions @@ -1,5 +1,5 @@ #!/bin/bash -curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"bZY6LMGHXbpLkyw14uW5XbRsH8LB5MhnLe\",\"count\":100,\"skip\":0,\"symbol\":\"KMD\"}" +curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"RWE3NWHT6Fb1zW4mY9LU859MPoWGYvtLfj\",\"count\":100,\"skip\":0,\"symbol\":\"KMD\"}" #curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"RRyBxbrAPRUBCUpiJgJZYrkxqrh8x5ta9Z\",\"count\":100,\"skip\":0,\"symbol\":\"MVP\"}" #curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"RMGpGoX82M1ZUUbHxZ3JKHacxY9NYVakqr\",\"count\":100,\"skip\":0,\"symbol\":\"USD\"}" #curl --url "http://127.0.0.1:7778" --data "{\"agent\":\"dex\",\"method\":\"listtransactions\",\"address\":\"RMGpGoX82M1ZUUbHxZ3JKHacxY9NYVakqr\",\"count\":100,\"skip\":0,\"symbol\":\"MVP\"}" diff --git a/iguana/tests/statstest b/iguana/tests/statstest index f9eec7e0b..9d95e23cc 100755 --- a/iguana/tests/statstest +++ b/iguana/tests/statstest @@ -1,2 +1,2 @@ #!/bin/bash -curl --url "http://127.0.0.1:7779" --data "{\"method\":\"start\"}" +curl --url "http://127.0.0.1:7779" --data "{\"method\":\"bitmap\",\"endtimestamp\":0,\"source\":\"KMD\",\"dest\":\"BTC\",\"numdates\":30}"