zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix missing univalue types during constructing

This commit is contained in:
Jonas Schnelli 2015-06-02 12:28:54 +02:00
parent 8f7e4abbe6
commit c7fbbc7e1d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpcblockchain.cpp
View File

@ -206,7 +206,7 @@ UniValue getrawmempool(const UniValue& params, bool fHelp)
setDepends.insert(txin.prevout.hash.ToString()); setDepends.insert(txin.prevout.hash.ToString());
} }
UniValue depends; UniValue depends(UniValue::VARR);
BOOST_FOREACH(const string& dep, setDepends) BOOST_FOREACH(const string& dep, setDepends)
{ {
depends.push_back(dep); depends.push_back(dep);
@ -635,7 +635,7 @@ UniValue getmempoolinfo(const UniValue& params, bool fHelp)
+ HelpExampleRpc("getmempoolinfo", "") + HelpExampleRpc("getmempoolinfo", "")
); );
UniValue ret; UniValue ret(UniValue::VOBJ);
ret.push_back(Pair("size", (int64_t) mempool.size())); ret.push_back(Pair("size", (int64_t) mempool.size()));
ret.push_back(Pair("bytes", (int64_t) mempool.GetTotalTxSize())); ret.push_back(Pair("bytes", (int64_t) mempool.GetTotalTxSize()));

2
src/rpcmisc.cpp
View File

@ -312,7 +312,7 @@ UniValue createmultisig(const UniValue& params, bool fHelp)
CScriptID innerID(inner); CScriptID innerID(inner);
CBitcoinAddress address(innerID); CBitcoinAddress address(innerID);
UniValue result; UniValue result(UniValue::VOBJ);
result.push_back(Pair("address", address.ToString())); result.push_back(Pair("address", address.ToString()));
result.push_back(Pair("redeemScript", HexStr(inner.begin(), inner.end()))); result.push_back(Pair("redeemScript", HexStr(inner.begin(), inner.end())));