Tests: make prioritise_transaction.py more robust
Github-Pull: #7697 Rebased-From: ec143391ef791c15c0d4520befb8863b61bfc2ea
This commit is contained in:
parent
ff9b436163
commit
c0d9e31611
@ -9,8 +9,7 @@
|
|||||||
|
|
||||||
from test_framework.test_framework import BitcoinTestFramework
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
from test_framework.util import *
|
from test_framework.util import *
|
||||||
from test_framework.mininode import COIN
|
from test_framework.mininode import COIN, MAX_BLOCK_SIZE
|
||||||
|
|
||||||
|
|
||||||
class PrioritiseTransactionTest(BitcoinTestFramework):
|
class PrioritiseTransactionTest(BitcoinTestFramework):
|
||||||
|
|
||||||
@ -29,14 +28,29 @@ class PrioritiseTransactionTest(BitcoinTestFramework):
|
|||||||
self.relayfee = self.nodes[0].getnetworkinfo()['relayfee']
|
self.relayfee = self.nodes[0].getnetworkinfo()['relayfee']
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
utxos = create_confirmed_utxos(self.relayfee, self.nodes[0], 90)
|
utxo_count = 90
|
||||||
|
utxos = create_confirmed_utxos(self.relayfee, self.nodes[0], utxo_count)
|
||||||
base_fee = self.relayfee*100 # our transactions are smaller than 100kb
|
base_fee = self.relayfee*100 # our transactions are smaller than 100kb
|
||||||
txids = []
|
txids = []
|
||||||
|
|
||||||
# Create 3 batches of transactions at 3 different fee rate levels
|
# Create 3 batches of transactions at 3 different fee rate levels
|
||||||
|
range_size = utxo_count // 3
|
||||||
for i in xrange(3):
|
for i in xrange(3):
|
||||||
txids.append([])
|
txids.append([])
|
||||||
txids[i] = create_lots_of_big_transactions(self.nodes[0], self.txouts, utxos[30*i:30*i+30], (i+1)*base_fee)
|
start_range = i * range_size
|
||||||
|
end_range = start_range + range_size
|
||||||
|
txids[i] = create_lots_of_big_transactions(self.nodes[0], self.txouts, utxos[start_range:end_range], (i+1)*base_fee)
|
||||||
|
|
||||||
|
# Make sure that the size of each group of transactions exceeds
|
||||||
|
# MAX_BLOCK_SIZE -- otherwise the test needs to be revised to create
|
||||||
|
# more transactions.
|
||||||
|
mempool = self.nodes[0].getrawmempool(True)
|
||||||
|
sizes = [0, 0, 0]
|
||||||
|
for i in xrange(3):
|
||||||
|
for j in txids[i]:
|
||||||
|
assert(j in mempool)
|
||||||
|
sizes[i] += mempool[j]['size']
|
||||||
|
assert(sizes[i] > MAX_BLOCK_SIZE) # Fail => raise utxo_count
|
||||||
|
|
||||||
# add a fee delta to something in the cheapest bucket and make sure it gets mined
|
# add a fee delta to something in the cheapest bucket and make sure it gets mined
|
||||||
# also check that a different entry in the cheapest bucket is NOT mined (lower
|
# also check that a different entry in the cheapest bucket is NOT mined (lower
|
||||||
@ -47,7 +61,7 @@ class PrioritiseTransactionTest(BitcoinTestFramework):
|
|||||||
self.nodes[0].generate(1)
|
self.nodes[0].generate(1)
|
||||||
|
|
||||||
mempool = self.nodes[0].getrawmempool()
|
mempool = self.nodes[0].getrawmempool()
|
||||||
print "Assert that prioritised transasction was mined"
|
print "Assert that prioritised transaction was mined"
|
||||||
assert(txids[0][0] not in mempool)
|
assert(txids[0][0] not in mempool)
|
||||||
assert(txids[0][1] in mempool)
|
assert(txids[0][1] in mempool)
|
||||||
|
|
||||||
@ -60,7 +74,7 @@ class PrioritiseTransactionTest(BitcoinTestFramework):
|
|||||||
assert(high_fee_tx != None)
|
assert(high_fee_tx != None)
|
||||||
|
|
||||||
# Add a prioritisation before a tx is in the mempool (de-prioritising a
|
# Add a prioritisation before a tx is in the mempool (de-prioritising a
|
||||||
# high-fee transaction).
|
# high-fee transaction so that it's now low fee).
|
||||||
self.nodes[0].prioritisetransaction(high_fee_tx, -1e15, -int(2*base_fee*COIN))
|
self.nodes[0].prioritisetransaction(high_fee_tx, -1e15, -int(2*base_fee*COIN))
|
||||||
|
|
||||||
# Add everything back to mempool
|
# Add everything back to mempool
|
||||||
@ -70,8 +84,11 @@ class PrioritiseTransactionTest(BitcoinTestFramework):
|
|||||||
mempool = self.nodes[0].getrawmempool()
|
mempool = self.nodes[0].getrawmempool()
|
||||||
assert(high_fee_tx in mempool)
|
assert(high_fee_tx in mempool)
|
||||||
|
|
||||||
# Now verify the high feerate transaction isn't mined.
|
# Now verify the modified-high feerate transaction isn't mined before
|
||||||
self.nodes[0].generate(5)
|
# the other high fee transactions. Keep mining until our mempool has
|
||||||
|
# decreased by all the high fee size that we calculated above.
|
||||||
|
while (self.nodes[0].getmempoolinfo()['bytes'] > sizes[0] + sizes[1]):
|
||||||
|
self.nodes[0].generate(1)
|
||||||
|
|
||||||
# High fee transaction should not have been mined, but other high fee rate
|
# High fee transaction should not have been mined, but other high fee rate
|
||||||
# transactions should have been.
|
# transactions should have been.
|
||||||
|
@ -427,6 +427,8 @@ def assert_is_hash_string(string, length=64):
|
|||||||
def satoshi_round(amount):
|
def satoshi_round(amount):
|
||||||
return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
|
return Decimal(amount).quantize(Decimal('0.00000001'), rounding=ROUND_DOWN)
|
||||||
|
|
||||||
|
# Helper to create at least "count" utxos
|
||||||
|
# Pass in a fee that is sufficient for relay and mining new transactions.
|
||||||
def create_confirmed_utxos(fee, node, count):
|
def create_confirmed_utxos(fee, node, count):
|
||||||
node.generate(int(0.5*count)+101)
|
node.generate(int(0.5*count)+101)
|
||||||
utxos = node.listunspent()
|
utxos = node.listunspent()
|
||||||
@ -454,6 +456,8 @@ def create_confirmed_utxos(fee, node, count):
|
|||||||
assert(len(utxos) >= count)
|
assert(len(utxos) >= count)
|
||||||
return utxos
|
return utxos
|
||||||
|
|
||||||
|
# Create large OP_RETURN txouts that can be appended to a transaction
|
||||||
|
# to make it large (helper for constructing large transactions).
|
||||||
def gen_return_txouts():
|
def gen_return_txouts():
|
||||||
# Some pre-processing to create a bunch of OP_RETURN txouts to insert into transactions we create
|
# Some pre-processing to create a bunch of OP_RETURN txouts to insert into transactions we create
|
||||||
# So we have big transactions (and therefore can't fit very many into each block)
|
# So we have big transactions (and therefore can't fit very many into each block)
|
||||||
@ -472,6 +476,16 @@ def gen_return_txouts():
|
|||||||
txouts = txouts + script_pubkey
|
txouts = txouts + script_pubkey
|
||||||
return txouts
|
return txouts
|
||||||
|
|
||||||
|
def create_tx(node, coinbase, to_address, amount):
|
||||||
|
inputs = [{ "txid" : coinbase, "vout" : 0}]
|
||||||
|
outputs = { to_address : amount }
|
||||||
|
rawtx = node.createrawtransaction(inputs, outputs)
|
||||||
|
signresult = node.signrawtransaction(rawtx)
|
||||||
|
assert_equal(signresult["complete"], True)
|
||||||
|
return signresult["hex"]
|
||||||
|
|
||||||
|
# Create a spend of each passed-in utxo, splicing in "txouts" to each raw
|
||||||
|
# transaction to make it large. See gen_return_txouts() above.
|
||||||
def create_lots_of_big_transactions(node, txouts, utxos, fee):
|
def create_lots_of_big_transactions(node, txouts, utxos, fee):
|
||||||
addr = node.getnewaddress()
|
addr = node.getnewaddress()
|
||||||
txids = []
|
txids = []
|
||||||
|
Loading…
Reference in New Issue
Block a user