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

logging added

Browse Source
This commit is contained in:
dimxy
2019-04-08 01:22:48 +05:00
parent f0eeb7efe1
commit ffb14229e5
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cc/prices.cpp
View File

@@ -274,8 +274,10 @@ UniValue prices_rawtxresult(UniValue &result,std::string rawtx,int32_t broadcast
int32_t prices_syntheticvec(std::vector<uint16_t> &vec,std::vector<std::string> synthetic) int32_t prices_syntheticvec(std::vector<uint16_t> &vec,std::vector<std::string> synthetic)
{ {
int32_t i,need,ind,depth = 0; std::string opstr; uint16_t opcode,weight; int32_t i,need,ind,depth = 0; std::string opstr; uint16_t opcode,weight;
if ( synthetic.size() == 0 ) if (synthetic.size() == 0) {
std::cerr << "synthetic expression is empty" << std::endl;
return(-1); return(-1);
}
for (i=0; i<synthetic.size(); i++) for (i=0; i<synthetic.size(); i++)
{ {
need = 0; need = 0;
@@ -300,14 +302,22 @@ int32_t prices_syntheticvec(std::vector<uint16_t> &vec,std::vector<std::string>
{ {
opcode = PRICES_WEIGHT | weight; opcode = PRICES_WEIGHT | weight;
need = 1; need = 1;
} else return(-2); }
if ( depth < need ) else {
std::cerr << "incorrect opcode=" << opstr << std::endl;
return(-2);
}
if (depth < need) {
std::cerr << "incorrect not enough operands for opcode=" << opstr << std::endl;
return(-3); return(-3);
}
depth -= need; depth -= need;
if ( (opcode & KOMODO_PRICEMASK) != PRICES_WEIGHT ) // weight if ( (opcode & KOMODO_PRICEMASK) != PRICES_WEIGHT ) // weight
depth++; depth++;
if ( depth > 3 ) if (depth > 3) {
std::cerr << "to many operands, last=" << opstr << std::endl;
return(-4); return(-4);
}
vec.push_back(opcode); vec.push_back(opcode);
} }
if ( depth != 0 ) if ( depth != 0 )