mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-15 08:31:49 +01:00
test: rename CBlockHeader .hash -> .hash_hex for consistency
Note that we unfortunately can't use a scripted diff here, as the `.hash` symbol is also used for other instances (e.g. CInv).
This commit is contained in:
@@ -481,15 +481,15 @@ def do_generate(args):
|
||||
# report
|
||||
bstr = "block" if gen.is_mine else "backup block"
|
||||
|
||||
next_delta = gen.next_block_delta(block.nBits, block.hash)
|
||||
next_delta = gen.next_block_delta(block.nBits, block.hash_hex)
|
||||
next_delta += block.nTime - time.time()
|
||||
next_is_mine = gen.next_block_is_mine(block.hash)
|
||||
next_is_mine = gen.next_block_is_mine(block.hash_hex)
|
||||
|
||||
logging.debug("Block hash %s payout to %s", block.hash, reward_addr)
|
||||
logging.debug("Block hash %s payout to %s", block.hash_hex, reward_addr)
|
||||
logging.info("Mined %s at height %d; next in %s (%s)", bstr, tmpl["height"], seconds_to_hms(next_delta), ("mine" if next_is_mine else "backup"))
|
||||
if r != "":
|
||||
logging.warning("submitblock returned %s for height %d hash %s", r, tmpl["height"], block.hash)
|
||||
lastheader = block.hash
|
||||
logging.warning("submitblock returned %s for height %d hash %s", r, tmpl["height"], block.hash_hex)
|
||||
lastheader = block.hash_hex
|
||||
|
||||
def do_calibrate(args):
|
||||
if args.nbits is not None and args.seconds is not None:
|
||||
|
||||
Reference in New Issue
Block a user