diff options
| author | Matt Corallo <[email protected]> | 2017-08-24 11:36:07 -0400 |
|---|---|---|
| committer | Matt Corallo <[email protected]> | 2017-09-11 15:51:25 -0400 |
| commit | ba206d2c63a8d3cbd4a8dd47e9ef126af1bb3bb9 (patch) | |
| tree | ae365cb374d581224b5fee69629e4f235f0d71f4 /src/rpc/mining.cpp | |
| parent | Merge #11268: [macOS] remove Growl support, remove unused code (diff) | |
| download | discoin-ba206d2c63a8d3cbd4a8dd47e9ef126af1bb3bb9.tar.xz discoin-ba206d2c63a8d3cbd4a8dd47e9ef126af1bb3bb9.zip | |
Deprecate confusing blockmaxsize, fix getmininginfo output
* This removes block-size-limiting code in favor of GBT clients
doing the limiting themselves (if at all).
* -blockmaxsize is deprecated and only used to calculate an implied
blockmaxweight, addressing confusion from multiple users.
* getmininginfo's currentblocksize return value was returning
garbage values, and has been removed, also removing a
GetSerializeSize call in some block generation inner loops and
potentially addressing some performance edge cases.
Diffstat (limited to 'src/rpc/mining.cpp')
| -rw-r--r-- | src/rpc/mining.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 980988370..c54dc7407 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -196,7 +196,6 @@ UniValue getmininginfo(const JSONRPCRequest& request) "\nResult:\n" "{\n" " \"blocks\": nnn, (numeric) The current block\n" - " \"currentblocksize\": nnn, (numeric) The last block size\n" " \"currentblockweight\": nnn, (numeric) The last block weight\n" " \"currentblocktx\": nnn, (numeric) The last block transaction\n" " \"difficulty\": xxx.xxxxx (numeric) The current difficulty\n" @@ -215,7 +214,6 @@ UniValue getmininginfo(const JSONRPCRequest& request) UniValue obj(UniValue::VOBJ); obj.push_back(Pair("blocks", (int)chainActive.Height())); - obj.push_back(Pair("currentblocksize", (uint64_t)nLastBlockSize)); obj.push_back(Pair("currentblockweight", (uint64_t)nLastBlockWeight)); obj.push_back(Pair("currentblocktx", (uint64_t)nLastBlockTx)); obj.push_back(Pair("difficulty", (double)GetDifficulty())); |