GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

s/d_params/dynafed_params/

Browse source
This commit is contained in:
Gregory Sanders 2019-06-14 13:06:38 -04:00
parent 1779956e69
commit 0fd39edf54
7 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/rpc/blockchain.cpp
View file

@ -95,12 +95,12 @@ UniValue paramEntryToJSON(const ConsensusParamEntry& entry)
return result;
}
UniValue dynaParamsToJSON(const DynaFedParams& d_params)
UniValue dynaParamsToJSON(const DynaFedParams& dynafed_params)
{
AssertLockHeld(cs_main);
UniValue ret(UniValue::VOBJ);
ret.pushKV("current", paramEntryToJSON(d_params.m_current));
ret.pushKV("proposed", paramEntryToJSON(d_params.m_proposed));
ret.pushKV("current", paramEntryToJSON(dynafed_params.m_current));
ret.pushKV("proposed", paramEntryToJSON(dynafed_params.m_proposed));
return ret;
}
@ -135,8 +135,8 @@ UniValue blockheaderToJSON(const CBlockIndex* tip, const CBlockIndex* blockindex
} else {
result.pushKV("signblock_witness_asm", ScriptToAsmStr(blockindex->proof.solution));
result.pushKV("signblock_witness_hex", HexStr(blockindex->proof.solution));
if (!blockindex->d_params.IsNull()) {
result.pushKV("dynamic_parameters", dynaParamsToJSON(blockindex->d_params));
if (!blockindex->dynafed_params.IsNull()) {
result.pushKV("dynamic_parameters", dynaParamsToJSON(blockindex->dynafed_params));
}
}
result.pushKV("nTx", (uint64_t)blockindex->nTx);