diff --git a/test/bitcoin_functional/functional/README.md b/test/bitcoin_functional/functional/README.md index 5e3009e6af..82568f3bde 100644 --- a/test/bitcoin_functional/functional/README.md +++ b/test/bitcoin_functional/functional/README.md @@ -29,7 +29,7 @@ don't have test cases for. - Avoid wildcard imports - Use a module-level docstring to describe what the test is testing, and how it is testing it. -- When subclassing the BitcoinTestFramwork, 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 the subclass, then locally-defined helper methods, then the `run_test()` method. - Use `'{}'.format(x)` for string formatting, not `'%s' % x`. diff --git a/test/functional/feature_blocksign.py b/test/functional/feature_blocksign.py index 3c32c65da0..3bc4b1c13e 100755 --- a/test/functional/feature_blocksign.py +++ b/test/functional/feature_blocksign.py @@ -154,7 +154,7 @@ def mine_block(self, make_transactions): result = miner.combineblocksigs(block, sigs, self.witnessScript) sigs = sigs + self.nodes[i].signblock(block, self.witnessScript) assert_equal(result["complete"], i >= self.required_signers) - # submitting should have no effect pre-threshhold + # submitting should have no effect pre-threshold if i < self.required_signers: miner.submitblock(result["hex"]) self.check_height(blockcount) diff --git a/test/functional/feature_tapscript_opcodes.py b/test/functional/feature_tapscript_opcodes.py index 8772a08d72..11cf1a43f3 100755 --- a/test/functional/feature_tapscript_opcodes.py +++ b/test/functional/feature_tapscript_opcodes.py @@ -289,7 +289,7 @@ def run_test(self): # Test introspection opcodes # 1a. No Pegins/issuances - self.log.info("Instrospection tests: outpoint flag") + self.log.info("Introspection tests: outpoint flag") self.tapscript_satisfy_test(CScript([OP_0, OP_INSPECTINPUTOUTPOINT, b'\x00', OP_EQUALVERIFY, OP_DROP, OP_DROP, OP_1])) # 1b. Add a pegin (Test pegin input must be 0x40) self.tapscript_satisfy_test(CScript([OP_0, OP_INSPECTINPUTOUTPOINT, b'\x40', OP_EQUALVERIFY, OP_DROP, OP_DROP, OP_1]), add_pegin=True) @@ -303,7 +303,7 @@ def run_test(self): self.tapscript_satisfy_test(CScript([OP_0, OP_INSPECTINPUTOUTPOINT, b'\x00', OP_EQUALVERIFY, OP_DROP, OP_DROP, OP_1]), add_pegin = True, add_issuance=True, fail="Script failed an OP_EQUALVERIFY operation") # Test opcode for inspecting prev tx - self.log.info("Instrospection tests: inputs") + self.log.info("Introspection tests: inputs") self.tapscript_satisfy_test(CScript([OP_0, OP_INSPECTINPUTOUTPOINT, b'\x00', OP_EQUALVERIFY, OP_TOALTSTACK, OP_EQUALVERIFY, OP_FROMALTSTACK, OP_EQUAL]), add_prevout=True) # Test taproot asset with blinding. @@ -350,12 +350,12 @@ def run_test(self): self.tapscript_satisfy_test(CScript([-1, OP_1, OP_INSPECTINPUTVALUE, OP_FALSE, OP_EQUAL]), fail="Introspection index out of bounds") # Test current input - self.log.info("Instrospection tests: current input index") + self.log.info("Introspection tests: current input index") self.tapscript_satisfy_test(CScript([OP_PUSHCURRENTINPUTINDEX, OP_0, OP_EQUAL])) self.tapscript_satisfy_test(CScript([OP_PUSHCURRENTINPUTINDEX, OP_1, OP_EQUAL]), fail="Script evaluated without error but finished with a false/empty top stack element") # Test Outputs - self.log.info("Instrospection tests: outputs") + self.log.info("Introspection tests: outputs") for blind in [True, False]: for out_pos in [0, 1]: self.tapscript_satisfy_test(CScript([out_pos, OP_INSPECTOUTPUTASSET, OP_TOALTSTACK, OP_EQUALVERIFY, OP_FROMALTSTACK, OP_EQUAL]), blind=blind, add_out_asset=out_pos) @@ -367,8 +367,8 @@ def run_test(self): self.tapscript_satisfy_test(CScript([120, OP_INSPECTOUTPUTASSET, OP_FALSE, OP_EQUAL]), fail="Introspection index out of bounds") self.tapscript_satisfy_test(CScript([-1, OP_INSPECTOUTPUTVALUE, OP_FALSE, OP_EQUAL]), fail="Introspection index out of bounds") - # Finally, check the tx instrospection - self.log.info("Instrospection tests: tx") + # Finally, check the tx introspection + self.log.info("Introspection tests: tx") # Test version equality self.tapscript_satisfy_test(CScript([OP_INSPECTVERSION, int(2).to_bytes(4, 'little'), OP_EQUAL]), ver = 2) self.tapscript_satisfy_test(CScript([OP_INSPECTVERSION, int(5).to_bytes(4, 'little'), OP_EQUAL]), ver = 2, fail="Script evaluated without error but finished with a false/empty top stack element")