sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #18366: tests: simplify next_block() function in feature_block

Browse Source 
612a931d1a3ac1678d02aed30c48fd25ccd113db tests: simplify next_block() function in feature_block (John Newbery)

Pull request description:

  The solve parameter is unnecessary. Remove it and add comments.

ACKs for top commit:
  MarcoFalke:
    ACK 612a931d1a3ac1678d02aed30c48fd25ccd113db
  TheQuantumPhysicist:
    ACK 612a931

Looks good. Thanks for improving it 😄
  practicalswift:
    ACK 612a931d1a3ac1678d02aed30c48fd25ccd113db -- simpler is better and patch looks correct :)

Tree-SHA512: 25b4879842ea37a3f598be886f02ce4c2fb0b5a618d02b266dbd380f5cbfdd71a8bd35ddd9d6f2cf83920e37c02caf9955a841a02b17ba75ac63f88d32f8b60b
This commit is contained in:
MarcoFalke 2020-03-17 10:23:53 -04:00 committed by UdjinM6
parent 944518085d
commit 4fa34dcea3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/functional/feature_block.py
View File

@ -631,17 +631,19 @@ class FullBlockTest(BitcoinTestFramework):
self.log.info("Reject a block with invalid work") self.log.info("Reject a block with invalid work")
self.move_tip(44) self.move_tip(44)
b47 = self.next_block(47, solve=False) b47 = self.next_block(47)
target = uint256_from_compact(b47.nBits) target = uint256_from_compact(b47.nBits)
while b47.sha256 <= target: while b47.sha256 <= target:
# Rehash nonces until an invalid too-high-hash block is found.
b47.nNonce += 1 b47.nNonce += 1
b47.rehash() b47.rehash()
self.send_blocks([b47], False, force_send=True, reject_reason='high-hash', reconnect=True) self.send_blocks([b47], False, force_send=True, reject_reason='high-hash', reconnect=True)
self.log.info("Reject a block with a timestamp >2 hours in the future") self.log.info("Reject a block with a timestamp >2 hours in the future")
self.move_tip(44) self.move_tip(44)
b48 = self.next_block(48, solve=False) b48 = self.next_block(48)
b48.nTime = int(self.mocktime) + 60 * 60 * 3 b48.nTime = int(self.mocktime) + 60 * 60 * 3
# Header timestamp has changed. Re-solve the block.
b48.solve() b48.solve()
self.send_blocks([b48], False, force_send=True, reject_reason='time-too-new') self.send_blocks([b48], False, force_send=True, reject_reason='time-too-new')
@ -1322,7 +1324,7 @@ class FullBlockTest(BitcoinTestFramework):
tx.rehash() tx.rehash()
return tx return tx
def next_block(self, number, spend=None, additional_coinbase_value=0, script=CScript([OP_TRUE]), solve=True, *, version=1): def next_block(self, number, spend=None, additional_coinbase_value=0, script=CScript([OP_TRUE]), *, version=1):
if self.tip is None: if self.tip is None:
base_block_hash = self.genesis_hash base_block_hash = self.genesis_hash
block_time = self.mocktime + 1 block_time = self.mocktime + 1
@ -1344,10 +1346,8 @@ class FullBlockTest(BitcoinTestFramework):
self.sign_tx(tx, spend) self.sign_tx(tx, spend)
self.add_transactions_to_block(block, [tx]) self.add_transactions_to_block(block, [tx])
block.hashMerkleRoot = block.calc_merkle_root() block.hashMerkleRoot = block.calc_merkle_root()
if solve: # Block is created. Find a valid nonce.
block.solve() block.solve()
else:
block.rehash()
self.tip = block self.tip = block
self.block_heights[block.sha256] = height self.block_heights[block.sha256] = height
assert number not in self.blocks assert number not in self.blocks