From c39133405ed5a4ca965d33394849a0d5ac3a0684 Mon Sep 17 00:00:00 2001 From: Alrighttt Date: Sun, 19 May 2019 23:04:18 +0200 Subject: [PATCH 1/2] change oraclessamples to obj --- src/cc/oracles.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/cc/oracles.cpp b/src/cc/oracles.cpp index a5d61d404..febc82c20 100644 --- a/src/cc/oracles.cpp +++ b/src/cc/oracles.cpp @@ -954,9 +954,10 @@ UniValue OracleDataSamples(uint256 reforacletxid,uint256 batontxid,int32_t num) { if ( (formatstr= (char *)format.c_str()) == 0 ) formatstr = (char *)""; - UniValue a(UniValue::VARR); - a.push_back(OracleFormat((uint8_t *)data.data(),(int32_t)data.size(),formatstr,(int32_t)format.size())); - a.push_back(uint256_str(str,batontxid)); + UniValue a(UniValue::VOBJ); + a.push_back(Pair("data",OracleFormat((uint8_t *)data.data(),(int32_t)data.size(),formatstr,(int32_t)format.size()))); + a.push_back(Pair("txid",uint256_str(str,batontxid))); + fprintf(stderr,"blahblahblahb.%s", uint256_str(str,batontxid)); b.push_back(a); batontxid = btxid; if ( ++n >= num && num != 0) From 5c77b99a66dc1305adcc9c02bb335695c21f457f Mon Sep 17 00:00:00 2001 From: Alrighttt Date: Sun, 19 May 2019 23:10:20 +0200 Subject: [PATCH 2/2] remove print, remove unused obj --- src/cc/oracles.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cc/oracles.cpp b/src/cc/oracles.cpp index febc82c20..7cd429182 100644 --- a/src/cc/oracles.cpp +++ b/src/cc/oracles.cpp @@ -924,14 +924,13 @@ std::string OracleData(int64_t txfee,uint256 oracletxid,std::vector da UniValue OracleFormat(uint8_t *data,int32_t datalen,char *format,int32_t formatlen) { - UniValue obj(UniValue::VARR); uint256 hash; int32_t i,j=0; int64_t val; char str[IGUANA_MAXSCRIPTSIZE*2+1]; + uint256 hash; int32_t i,j=0; int64_t val; char str[IGUANA_MAXSCRIPTSIZE*2+1]; for (i=0; i= datalen ) break; } @@ -957,7 +956,6 @@ UniValue OracleDataSamples(uint256 reforacletxid,uint256 batontxid,int32_t num) UniValue a(UniValue::VOBJ); a.push_back(Pair("data",OracleFormat((uint8_t *)data.data(),(int32_t)data.size(),formatstr,(int32_t)format.size()))); a.push_back(Pair("txid",uint256_str(str,batontxid))); - fprintf(stderr,"blahblahblahb.%s", uint256_str(str,batontxid)); b.push_back(a); batontxid = btxid; if ( ++n >= num && num != 0)