diff --git a/test/functional/feature_bip68_sequence.py b/test/functional/feature_bip68_sequence.py --- a/test/functional/feature_bip68_sequence.py +++ b/test/functional/feature_bip68_sequence.py @@ -68,14 +68,12 @@ "Running test BIP68 not consensus before versionbits activation") self.test_bip68_not_consensus() - self.log.info("Verifying nVersion=2 transactions aren't standard") - self.test_version2_relay(before_activation=True) - self.log.info("Activating BIP68 (and 112/113)") self.activateCSV() - self.log.info("Verifying nVersion=2 transactions are now standard") - self.test_version2_relay(before_activation=False) + print("Verifying nVersion=2 transactions are standard.") + print("Note that with current versions of bitcoin software, nVersion=2 transactions are always standard (independent of BIP68 activation status).") + self.test_version2_relay() self.log.info("Passed") @@ -474,8 +472,8 @@ connect_nodes(self.nodes[0], self.nodes[1]) sync_blocks(self.nodes) - # Use self.nodes[1] to test standardness relay policy - def test_version2_relay(self, before_activation): + # Use self.nodes[1] to test that version 2 transactions are standard. + def test_version2_relay(self): inputs = [] outputs = {self.nodes[1].getnewaddress(): 1.0} rawtx = self.nodes[1].createrawtransaction(inputs, outputs) @@ -484,11 +482,7 @@ tx.nVersion = 2 tx_signed = self.nodes[1].signrawtransactionwithwallet(ToHex(tx))[ "hex"] - try: - self.nodes[1].sendrawtransaction(tx_signed) - assert not before_activation - except: - assert before_activation + self.nodes[1].sendrawtransaction(tx_signed) if __name__ == '__main__':