diff options
| author | glozow <gloriajzhao@gmail.com> | 2022-07-12 15:57:17 +0100 |
|---|---|---|
| committer | glozow <gloriajzhao@gmail.com> | 2022-07-12 15:58:39 +0100 |
| commit | 39d111aee769cefee1fc7fedda8973b2e3b3b678 (patch) | |
| tree | afe765a3645b3ddb1e4e302dc996691dd8587b08 /test | |
| parent | 316afb1eca47fe179584bd2d8ae400f9aff474d4 (diff) | |
| parent | 1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc (diff) | |
| download | bitcoin-39d111aee769cefee1fc7fedda8973b2e3b3b678.tar.xz | |
Merge bitcoin/bitcoin#25575: Address comments remaining from #25353
1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc Address comments remaining from #25353 (Antoine Riard)
Pull request description:
This PR should address the remaining comments from #25353.
ACKs for top commit:
MarcoFalke:
cr ACK 1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc
glozow:
ACK 1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc
w0xlt:
cr ACK https://github.com/bitcoin/bitcoin/pull/25575/commits/1056bbdfcd40b6bc4e16844c6da5cf666e87b1bc
Tree-SHA512: 194524193b1f087742c04d3cbe221e2ccf62e1f9303dc6668d62b73bd2dc0c039b7d68b33658dbee7809bd14bb8a5479f8e7928180b18c3180fdfbe3876c3ca1
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/feature_rbf.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/feature_rbf.py b/test/functional/feature_rbf.py index 8e5cbba01a..1a8362d94d 100755 --- a/test/functional/feature_rbf.py +++ b/test/functional/feature_rbf.py @@ -702,17 +702,16 @@ class ReplaceByFeeTest(BitcoinTestFramework): assert_raises_rpc_error(-26, "insufficient fee", self.nodes[0].sendrawtransaction, tx.serialize().hex()) def test_fullrbf(self): - txid = self.wallet.send_self_transfer(from_node=self.nodes[0])['txid'] - self.generate(self.nodes[0], 1) - confirmed_utxo = self.wallet.get_utxo(txid=txid) + confirmed_utxo = self.make_utxo(self.nodes[0], int(2 * COIN)) self.restart_node(0, extra_args=["-mempoolfullrbf=1"]) + assert self.nodes[0].getmempoolinfo()["fullrbf"] # Create an explicitly opt-out transaction optout_tx = self.wallet.send_self_transfer( from_node=self.nodes[0], utxo_to_spend=confirmed_utxo, - sequence=SEQUENCE_FINAL, + sequence=BIP125_SEQUENCE_NUMBER + 1, fee_rate=Decimal('0.01'), ) assert_equal(False, self.nodes[0].getmempoolentry(optout_tx['txid'])['bip125-replaceable']) @@ -728,6 +727,7 @@ class ReplaceByFeeTest(BitcoinTestFramework): # Optout_tx is not anymore in the mempool. assert optout_tx['txid'] not in self.nodes[0].getrawmempool() + assert conflicting_tx['txid'] in self.nodes[0].getrawmempool() if __name__ == '__main__': ReplaceByFeeTest().main() |