Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-02 23:42:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Diff-minimise

Browse Source
This commit is contained in:
Luke Dashjr 2023-10-03 18:26:54 +00:00
parent 319e6c2bed
commit cf1bda10ff
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rpc/mining.cpp
View File

@ -49,9 +49,8 @@ using node::UpdateTime;
/** /**
* Return average network hashes per second based on the last 'lookup' blocks, * Return average network hashes per second based on the last 'lookup' blocks,
* or from the last difficulty change if 'lookup' is -1. * or from the last difficulty change if 'lookup' is nonpositive.
* If 'height' is -1, compute the estimate from current chain tip. * If 'height' is nonnegative, compute the estimate at the time when a given block was found.
* If 'height' is a valid block height, compute the estimate at the time when a given block was found.
*/ */
static UniValue GetNetworkHashPS(int lookup, int height, const CChain& active_chain) { static UniValue GetNetworkHashPS(int lookup, int height, const CChain& active_chain) {
if (lookup < -1 || lookup == 0) { if (lookup < -1 || lookup == 0) {
@ -64,7 +63,7 @@ static UniValue GetNetworkHashPS(int lookup, int height, const CChain& active_ch
const CBlockIndex* pb = active_chain.Tip(); const CBlockIndex* pb = active_chain.Tip();
if (height >= 0) { if (height >= 0 && height < active_chain.Height()) {
pb = active_chain[height]; pb = active_chain[height];
} }
@ -72,7 +71,7 @@ static UniValue GetNetworkHashPS(int lookup, int height, const CChain& active_ch
return 0; return 0;
// If lookup is -1, then use blocks since last difficulty change. // If lookup is -1, then use blocks since last difficulty change.
if (lookup == -1) if (lookup <= 0)
lookup = pb->nHeight % Params().GetConsensus().DifficultyAdjustmentInterval() + 1; lookup = pb->nHeight % Params().GetConsensus().DifficultyAdjustmentInterval() + 1;
// If lookup is larger than chain, then set it to chain length. // If lookup is larger than chain, then set it to chain length.

8
test/functional/rpc_blockchain.py
View File

@ -437,6 +437,7 @@ class BlockchainTest(BitcoinTestFramework):
def _test_getnetworkhashps(self): def _test_getnetworkhashps(self):
self.log.info("Test getnetworkhashps") self.log.info("Test getnetworkhashps")
hashes_per_second = self.nodes[0].getnetworkhashps()
assert_raises_rpc_error( assert_raises_rpc_error(
-3, -3,
textwrap.dedent(""" textwrap.dedent("""
@ -448,6 +449,9 @@ class BlockchainTest(BitcoinTestFramework):
""").strip(), """).strip(),
lambda: self.nodes[0].getnetworkhashps("a", []), lambda: self.nodes[0].getnetworkhashps("a", []),
) )
# This should be 2 hashes every 10 minutes or 1/300
assert abs(hashes_per_second * 300 - 1) < 0.0001
assert_raises_rpc_error( assert_raises_rpc_error(
-8, -8,
"Block does not exist at specified height", "Block does not exist at specified height",
@ -473,10 +477,6 @@ class BlockchainTest(BitcoinTestFramework):
hashes_per_second = self.nodes[0].getnetworkhashps(100, 0) hashes_per_second = self.nodes[0].getnetworkhashps(100, 0)
assert_equal(hashes_per_second, 0) assert_equal(hashes_per_second, 0)
# This should be 2 hashes every 10 minutes or 1/300
hashes_per_second = self.nodes[0].getnetworkhashps()
assert abs(hashes_per_second * 300 - 1) < 0.0001
# Ensure long lookups get truncated to chain length # Ensure long lookups get truncated to chain length
hashes_per_second = self.nodes[0].getnetworkhashps(self.nodes[0].getblockcount() + 1000) hashes_per_second = self.nodes[0].getnetworkhashps(self.nodes[0].getblockcount() + 1000)
assert hashes_per_second > 0.003 assert hashes_per_second > 0.003