diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-23 15:52:57 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-23 15:53:06 +0100 |
| commit | 75bf23d8613a28928e18a0b05135d08e354452e0 (patch) | |
| tree | 6e13cade962fb6e655b5e77c6d22e8762286e549 /test/functional/mempool_packages.py | |
| parent | a2fa11f9de7873325fd35f22cc559f697391f82e (diff) | |
| parent | fa074d2c7b9c3d34876c428d12672a505d4ce4eb (diff) | |
| download | bitcoin-75bf23d8613a28928e18a0b05135d08e354452e0.tar.xz | |
Merge #20399: Revert "Merge #19606: Backport wtxid relay to v0.20"
fa074d2c7b9c3d34876c428d12672a505d4ce4eb Revert "Merge #19606: Backport wtxid relay to v0.20" (MarcoFalke)
Pull request description:
The 0.20 branch has bugfixes that should be released. However, a tag can currently not be created because the latest merge introduced a regression and is not a bugfix (https://github.com/bitcoin/bitcoin/pull/20317#issuecomment-723754509, https://github.com/bitcoin/bitcoin/pull/20317#issuecomment-727624755).
Fix that by reverting the last merge. Can be reviewed by re-doing the revert or calling `git diff HEAD HEAD~2 | wc` and observing an empty diff.
ACKs for top commit:
laanwj:
Code review ACK fa074d2c7b9c3d34876c428d12672a505d4ce4eb
Tree-SHA512: 1a1314b9bb85f44696dc307845e80292998d6c9c000e7386c48405e74400d9cd22be6996e555f198da917e04024a1c8e609dfd830759a27fe4070168b0d272bb
Diffstat (limited to 'test/functional/mempool_packages.py')
| -rwxr-xr-x | test/functional/mempool_packages.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/test/functional/mempool_packages.py b/test/functional/mempool_packages.py index 5a1a73d16e..a07dad18d6 100755 --- a/test/functional/mempool_packages.py +++ b/test/functional/mempool_packages.py @@ -67,15 +67,10 @@ class MempoolPackagesTest(BitcoinTestFramework): fee = Decimal("0.0001") # MAX_ANCESTORS transactions off a confirmed tx should be fine chain = [] - witness_chain = [] for i in range(MAX_ANCESTORS): (txid, sent_value) = self.chain_transaction(self.nodes[0], txid, 0, value, fee, 1) value = sent_value chain.append(txid) - # We need the wtxids to check P2P announcements - fulltx = self.nodes[0].getrawtransaction(txid) - witnesstx = self.nodes[0].decoderawtransaction(fulltx, True) - witness_chain.append(witnesstx['hash']) # Check mempool has MAX_ANCESTORS transactions in it, and descendant and ancestor # count and fees should look correct |