Bugfix: PrioritiseTransaction updates the mempool tx counter #10196

pull sdaftuar wants to merge 2 commits into bitcoin:master from sdaftuar:2017-04-prioritise-transaction changing 3 files +15 −3

sdaftuar commented at 2:36 PM on April 12, 2017: member

The mempool's nTransactionsUpdated is used by getblocktemplate to trigger new invocations of CreateNewBlock().
fanquake added the label Mempool on Apr 12, 2017
TheBlueMatt commented at 8:34 PM on April 12, 2017: member

utACK 909306cde3770ed7019e7b635e24cedbd9de66ce
dcousens approved
gmaxwell approved
gmaxwell commented at 8:28 PM on April 14, 2017: contributor

utACK.
sipa commented at 12:16 PM on April 17, 2017: member

Test for this?
sdaftuar commented at 4:55 PM on April 18, 2017: member

@sipa Test added in 6a61424c9eed072ae8d79d68aac71f525c1608b5
luke-jr commented at 6:28 PM on April 19, 2017: member

utACK, good catch
luke-jr approved
luke-jr referenced this in commit d28d583820 on Apr 21, 2017
luke-jr referenced this in commit 22246c889c on Apr 21, 2017
luke-jr referenced this in commit 71463a7d18 on Apr 21, 2017

Bugfix: PrioritiseTransaction updates the mempool tx counter

The mempool's nTransactionsUpdated is used by getblocktemplate
to trigger new invocations of CreateNewBlock().

acc2e4bc96

[qa] Test prioritise_transaction / getblocktemplate interaction 6c2e25caf6
sdaftuar force-pushed on May 6, 2017
sdaftuar commented at 9:33 AM on May 6, 2017: member

Rebased (due to conflict in the test)
sdaftuar commented at 1:15 AM on May 12, 2017: member

Anything else needed here?

in test/functional/prioritise_transaction.py:118 in 6c2e25caf6

 114 | @@ -115,5 +115,16 @@ def run_test(self):
 115 |          assert_equal(self.nodes[0].sendrawtransaction(tx_hex), tx_id)
 116 |          assert(tx_id in self.nodes[0].getrawmempool())
 117 |  
 118 | +        # Test that calling prioritisetransaction is sufficient to trigger

paveljanik commented at 10:50 AM on May 12, 2017:

nit: What about some self.log.info call here?

self.log.info("Assert that prioritising transaction changes the block template")

paveljanik commented at 10:51 AM on May 12, 2017: contributor

tested ACK https://github.com/bitcoin/bitcoin/pull/10196/commits/6c2e25caf6b6e55bbb4161f815f1c6402ac10d10

Test fails on master, so OK.
sipa commented at 8:17 PM on May 17, 2017: member

utACK 6c2e25caf6b6e55bbb4161f815f1c6402ac10d10
sipa merged this on May 17, 2017
sipa closed this on May 17, 2017
sipa referenced this in commit bee3529971 on May 17, 2017
luke-jr referenced this in commit 32877915e1 on Jun 5, 2017
luke-jr referenced this in commit d9e893418e on Jun 5, 2017
luke-jr referenced this in commit 07cdaa9934 on Jun 5, 2017
luke-jr referenced this in commit ee80bf3095 on Jun 5, 2017
luke-jr referenced this in commit 74653a41fe on Jun 5, 2017
nomnombtc referenced this in commit 68973bfb5d on Jul 17, 2017
nomnombtc referenced this in commit 234069f8b0 on Jul 17, 2017
codablock referenced this in commit bcef7260d0 on Jan 26, 2018
lateminer referenced this in commit bb93c3c6eb on Jan 5, 2019
andvgal referenced this in commit 06295839d0 on Jan 6, 2019
CryptoCentric referenced this in commit 9d7cc1178b on Feb 27, 2019
jasonbcox referenced this in commit d20f0fb142 on Jun 28, 2019
jtoomim referenced this in commit 978311aeda on Jun 29, 2019
jonspock referenced this in commit 6c76f1faf1 on Jul 5, 2019
jonspock referenced this in commit 37b81943a5 on Jul 5, 2019
jonspock referenced this in commit f7e5ee6432 on Jul 6, 2019
jonspock referenced this in commit bdc828b314 on Jul 7, 2019
jonspock referenced this in commit c72dd3a9ac on Jul 7, 2019
proteanx referenced this in commit cc6fc21453 on Jul 7, 2019
jonspock referenced this in commit 95e2e122c6 on Jul 9, 2019
DrahtBot locked this on Sep 8, 2021

Contributors

Labels