mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-10 10:52:31 -05:00
[tests] Recommend f-strings for formatting, update feature_block to use them
This commit is contained in:
parent
8ae9d314e9
commit
97c738ff1b
2 changed files with 6 additions and 6 deletions
|
@ -34,7 +34,7 @@ don't have test cases for.
|
||||||
- When subclassing the BitcoinTestFramework, place overrides for the
|
- When subclassing the BitcoinTestFramework, place overrides for the
|
||||||
`set_test_params()`, `add_options()` and `setup_xxxx()` methods at the top of
|
`set_test_params()`, `add_options()` and `setup_xxxx()` methods at the top of
|
||||||
the subclass, then locally-defined helper methods, then the `run_test()` method.
|
the subclass, then locally-defined helper methods, then the `run_test()` method.
|
||||||
- Use `'{}'.format(x)` for string formatting, not `'%s' % x`.
|
- Use `f'{x}'` for string formatting in preference to `'{}'.format(x)` or `'%s' % x`.
|
||||||
|
|
||||||
#### Naming guidelines
|
#### Naming guidelines
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,7 @@ class FullBlockTest(BitcoinTestFramework):
|
||||||
# Allow the block to mature
|
# Allow the block to mature
|
||||||
blocks = []
|
blocks = []
|
||||||
for i in range(NUM_BUFFER_BLOCKS_TO_GENERATE):
|
for i in range(NUM_BUFFER_BLOCKS_TO_GENERATE):
|
||||||
blocks.append(self.next_block("maturitybuffer.{}".format(i)))
|
blocks.append(self.next_block(f"maturitybuffer.{i}"))
|
||||||
self.save_spendable_output()
|
self.save_spendable_output()
|
||||||
self.send_blocks(blocks)
|
self.send_blocks(blocks)
|
||||||
|
|
||||||
|
@ -151,8 +151,8 @@ class FullBlockTest(BitcoinTestFramework):
|
||||||
if template.valid_in_block:
|
if template.valid_in_block:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
self.log.info("Reject block with invalid tx: %s", TxTemplate.__name__)
|
self.log.info(f"Reject block with invalid tx: {TxTemplate.__name__}")
|
||||||
blockname = "for_invalid.%s" % TxTemplate.__name__
|
blockname = f"for_invalid.{TxTemplate.__name__}"
|
||||||
badblock = self.next_block(blockname)
|
badblock = self.next_block(blockname)
|
||||||
badtx = template.get_tx()
|
badtx = template.get_tx()
|
||||||
if TxTemplate != invalid_txs.InputMissing:
|
if TxTemplate != invalid_txs.InputMissing:
|
||||||
|
@ -1355,12 +1355,12 @@ class FullBlockTest(BitcoinTestFramework):
|
||||||
|
|
||||||
# save the current tip so it can be spent by a later block
|
# save the current tip so it can be spent by a later block
|
||||||
def save_spendable_output(self):
|
def save_spendable_output(self):
|
||||||
self.log.debug("saving spendable output %s" % self.tip.vtx[0])
|
self.log.debug(f"saving spendable output {self.tip.vtx[0]}")
|
||||||
self.spendable_outputs.append(self.tip)
|
self.spendable_outputs.append(self.tip)
|
||||||
|
|
||||||
# get an output that we previously marked as spendable
|
# get an output that we previously marked as spendable
|
||||||
def get_spendable_output(self):
|
def get_spendable_output(self):
|
||||||
self.log.debug("getting spendable output %s" % self.spendable_outputs[0].vtx[0])
|
self.log.debug(f"getting spendable output {self.spendable_outputs[0].vtx[0]}")
|
||||||
return self.spendable_outputs.pop(0).vtx[0]
|
return self.spendable_outputs.pop(0).vtx[0]
|
||||||
|
|
||||||
# move the tip back to a previous block
|
# move the tip back to a previous block
|
||||||
|
|
Loading…
Add table
Reference in a new issue