DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Deprecate prices_extract

Browse Source
This commit is contained in:
jl777
2019-04-15 23:31:59 -11:00
parent 094f72afb4
commit 81aa1908d9
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cc/CCPrices.h
View File

@@ -18,7 +18,6 @@
#define CC_PRICES_H #define CC_PRICES_H
#include "CCinclude.h" #include "CCinclude.h"
int32_t prices_extract(int64_t *pricedata,int32_t firstheight,int32_t numblocks,int32_t ind);
int32_t komodo_priceget(int64_t *buf64,int32_t ind,int32_t height,int32_t numblocks); int32_t komodo_priceget(int64_t *buf64,int32_t ind,int32_t height,int32_t numblocks);
#define PRICES_DAYWINDOW ((3600*24/ASSETCHAINS_BLOCKTIME) + 1) #define PRICES_DAYWINDOW ((3600*24/ASSETCHAINS_BLOCKTIME) + 1)

6
src/cc/prices.cpp
View File

@@ -320,8 +320,7 @@ int32_t prices_syntheticvec(std::vector<uint16_t> &vec,std::vector<std::string>
int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t minmax,int16_t leverage) int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t minmax,int16_t leverage)
{ {
int32_t i,ind,errcode,depth,retval = -1; uint16_t opcode; int64_t *pricedata,pricestack[4],price,den,a,b,c; int32_t i,ind,errcode,depth,retval = -1; uint16_t opcode; int64_t pricedata[PRICES_MAXDATAPOINTS],pricestack[4],price,den,a,b,c;
pricedata = (int64_t *)calloc(sizeof(*pricedata)*3,1 + PRICES_DAYWINDOW*2 + PRICES_SMOOTHWIDTH);
price = den = depth = errcode = 0; price = den = depth = errcode = 0;
for (i=0; i<vec.size(); i++) for (i=0; i<vec.size(); i++)
{ {
@@ -331,7 +330,7 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
{ {
case 0: case 0:
pricestack[depth] = 0; pricestack[depth] = 0;
if ( prices_extract(pricedata,height,1,ind) == 0 ) if ( komodo_priceget(pricedata,ind,height,1) > 0 )
{ {
if ( minmax == 0 ) if ( minmax == 0 )
pricestack[depth] = pricedata[2]; pricestack[depth] = pricedata[2];
@@ -420,7 +419,6 @@ int64_t prices_syntheticprice(std::vector<uint16_t> vec,int32_t height,int32_t m
if ( errcode != 0 ) if ( errcode != 0 )
break; break;
} }
free(pricedata);
if ( den == 0 ) if ( den == 0 )
return(-11); return(-11);
else if ( depth != 0 ) else if ( depth != 0 )

4
src/rpc/blockchain.cpp
View File

@@ -1156,7 +1156,7 @@ UniValue paxprice(const UniValue& params, bool fHelp)
return ret; return ret;
} }
int32_t prices_extract(int64_t *pricedata,int32_t firstheight,int32_t numblocks,int32_t ind) /*int32_t prices_extract(int64_t *pricedata,int32_t firstheight,int32_t numblocks,int32_t ind)
{ {
int32_t height,i,n,width,numpricefeeds = -1; uint64_t seed,ignore,rngval; uint32_t rawprices[1440*6],*ptr; int64_t *tmpbuf; int32_t height,i,n,width,numpricefeeds = -1; uint64_t seed,ignore,rngval; uint32_t rawprices[1440*6],*ptr; int64_t *tmpbuf;
width = numblocks+PRICES_DAYWINDOW*2+PRICES_SMOOTHWIDTH; width = numblocks+PRICES_DAYWINDOW*2+PRICES_SMOOTHWIDTH;
@@ -1188,7 +1188,7 @@ int32_t prices_extract(int64_t *pricedata,int32_t firstheight,int32_t numblocks,
pricedata[i*3+2] = komodo_priceave(tmpbuf,&pricedata[i*3+1],3); pricedata[i*3+2] = komodo_priceave(tmpbuf,&pricedata[i*3+1],3);
free(tmpbuf); free(tmpbuf);
return(0); return(0);
} }*/
UniValue prices(const UniValue& params, bool fHelp) UniValue prices(const UniValue& params, bool fHelp)
{ {