diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-02-15 08:56:43 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-15 08:57:50 -0500 |
| commit | eca1273c3500497defe8de8fde817b096aa1b952 (patch) | |
| tree | 64872b60294279c46b7664157fd7e4e1d3e4f922 /test/functional/test_framework/blocktools.py | |
| parent | bf3677a6bb48cd4fc963d274748f304a46d9ccd5 (diff) | |
| parent | fa178a6385bf300499fb18940051fc4142fb5b6b (diff) | |
| download | bitcoin-eca1273c3500497defe8de8fde817b096aa1b952.tar.xz | |
Merge #15383: [rpc] mining: Omit uninitialized currentblockweight, currentblocktx
fa178a6385 [rpc] mining: Omit uninitialized currentblockweight, currentblocktx (MarcoFalke)
Pull request description:
Previously we'd report "0", which could be mistaken for a valid number. E.g. the number of transactions is 0 or the block weight is 0, whatever that means.
Tree-SHA512: ee94ab203a329e272211b726f4c23edec4b09c650ec363b77fd59ad9264165d73064f78ebb9e11b5c2c543b73c157752410a307655560531c7d5444d203aa0ea
Diffstat (limited to 'test/functional/test_framework/blocktools.py')
| -rw-r--r-- | test/functional/test_framework/blocktools.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py index 6b47cae4c3..15f4502994 100644 --- a/test/functional/test_framework/blocktools.py +++ b/test/functional/test_framework/blocktools.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2015-2018 The Bitcoin Core developers +# Copyright (c) 2015-2019 The Bitcoin Core developers # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Utilities for manipulating blocks and transactions.""" @@ -43,9 +43,13 @@ from io import BytesIO MAX_BLOCK_SIGOPS = 20000 +# Genesis block time (regtest) +TIME_GENESIS_BLOCK = 1296688602 + # From BIP141 WITNESS_COMMITMENT_HEADER = b"\xaa\x21\xa9\xed" + def create_block(hashprev, coinbase, ntime=None, *, version=1): """Create a block (with regtest difficulty).""" block = CBlock() |