LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

fixing functional test run

Browse source
This commit is contained in:
Brannon King 2020-02-25 16:33:43 -07:00 committed by Anthony Fieroni
parent 1138fac5e1
commit b7ad2beabd
7 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -138,3 +138,4 @@ compile_commands\.json
osx_volname osx_volname
dist/ dist/
*.background.tiff *.background.tiff
**/compiler*\.d

8
test/functional/data/rpc_getblockstats.json
View file

@ -102,8 +102,8 @@
"00000020c0bab96390e8b6470f3e499d8242e6aa2e10d730c4bc5c08f0bed52cc6a581d3f2c617558f17c4624b418c93ee54db4b336de5893c1ae3ceb7f0ebbf3489717801000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401630101ffffffff0200e1f505000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf900000000", "00000020c0bab96390e8b6470f3e499d8242e6aa2e10d730c4bc5c08f0bed52cc6a581d3f2c617558f17c4624b418c93ee54db4b336de5893c1ae3ceb7f0ebbf3489717801000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401630101ffffffff0200e1f505000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf900000000",
"000000203862c5ba29ee33ff1f73a2ea99895a50765d16854e90c36cd9c4453f63223439dcf34e59511ec731270b3be77cde9cea36d687107869f7922caf34407cef448801000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401640101ffffffff0200e1f505000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf900000000", "000000203862c5ba29ee33ff1f73a2ea99895a50765d16854e90c36cd9c4453f63223439dcf34e59511ec731270b3be77cde9cea36d687107869f7922caf34407cef448801000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20010000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401640101ffffffff0200e1f505000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf900000000",
"00000020c8d28e0e110b6091c131db734ce1e2f0fd0aaa229be7dff3d747ec840d9125a8fa9de6495f555abd1fc167ebbf0e74ec48dd62b62a6e63c5f190de905e0c2d0d01000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401650101ffffffff0200e1f505000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf900000000", "00000020c8d28e0e110b6091c131db734ce1e2f0fd0aaa229be7dff3d747ec840d9125a8fa9de6495f555abd1fc167ebbf0e74ec48dd62b62a6e63c5f190de905e0c2d0d01000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20000000000102000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401650101ffffffff0200e1f505000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ede2f61c3f71d1defd3fa999dfa36953755c690689799962b48bebd836974e8cf900000000",
"00000020bb47178c6cc901e281828e1a526a57e91f9ef31ba6be4a21273f39606c1a2af1cdfdaadac3d84bcd14b3bd4cc965d8d5ccd81355a0a96b1709dd94908fff261e01000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20010000000202000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401660101ffffffff0294f2f505000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed52330c7fa327f661b63ed848448e71fa63440d53905fec226ca31ae25a21b878000000000200000001c0d11554e9f1894363c20014df861e1a47b3008cb972a2af2e927764c74e8a19000000006a47304402204c70240b072ed4b3b22b97660dd92e9b373ec49bb23e40a8c70ec28bcd5463bd0220106702d60d8a0290561980ef8de8cdf38b3b3080d6388a895c5ad5f76fee829201210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffeffffff0200b4c404000000001976a9140b083b5ce046a4848de190c53be2f9ce4a39d75288ac6c1b3101000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac65000000", "00000020bb47178c6cc901e281828e1a526a57e91f9ef31ba6be4a21273f39606c1a2af1c30ef858b1f408da9f0b5b25e33c983962e540026dcefacec843fa5f8679d3f601000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20010000000202000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401660101ffffffff0294f2f505000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9edc13ee107e6a8a4fbf390906c1da52a1f9c99159245ffa4717b5e9b08d51f7ead000000000200000001c0d11554e9f1894363c20014df861e1a47b3008cb972a2af2e927764c74e8a19000000006a4730440220239a671108a8b6262ef3e3db1b041bd67e6bf4e627e050def16684183368fd49022072039ef5a0ae728ce79e8ba0180ff024d1a734297b5d35e8ef69769ce926a80501210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffeffffff0200b4c404000000001976a91443e52fe7afb3673b9aea3e0d1dbd18e3c96ed6d088ac6c1b3101000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac65000000",
"0000002015390cb053778fbdd1db2dccf881505975d614ed47b9db6161ee3cccb8f5906db2c2932c8ece24b3d6d9310fc64dfce5948aa1bfefc22651ea2c105cf8d2e4f401000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20010000000402000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401670101ffffffff02a208f605000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed269d2d170475b8c4592dd4f9e5cd451b3e232a60acc3bf1c04937a4ed5fc76bf000000000200000001cf8f252c570e46f00ee376347c567d6d7c38d04540d7297e01f2cf5f8d9a5e0f000000006a47304402204444ca874269fe4d4d9b664644f0a290097cb2611c1be2611b2e0f4c63a63fb60220128bca69cb06d9b34130c3ec525052e110c90d716189fab457c7e70f28d9d33e0121031d54255e9c933267096c5194d1bca2fd2821506d9f58cae299a32f25622af347feffffff0200879303000000001976a914173f5bab5538184d45c591ed1123061f42a32c2b88ac6c1b3101000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac66000000020000000141ba32d7bcbe6a57cba91cfc9c6383cfc76223f32337dbc8a96e5b2c4b76c298000000006a473044022004b9fc2211fc858491750e98bfa1a29b85e660ac8bfab7411a7e49c7752905a2022049820ed986fa7dabc8e0b9f05cf2fda417d15c5dd059070feac7a793bac6398001210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffeffffff02002d3101000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac6ca2c404000000001976a91447f9fda3a6a8dcc3e1b44bcdda9028ad8dc1741888ac6600000002000000014674d2603d28998249e69b1b4a84f2c231d7054116861edf2ae0c446944de45c000000006a473044022065d016e19585209cf242b7c9059f7fc7d813d27dfe0a7ad4c5380864d62aa805022066c5bda4e5e1ed05225e942bec5554cb23ac6a6f351ce1ad25ab5f411e39fa6a01210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffeffffff0186283101000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac66000000" "00000020d3becefaef4c7761b4ee5163a2c77cb483655b2476b87884c961c2c0aacc781189a6f45591c8220446adcbadad28c7fdba0c77f60908b2d5f45fb20b073bb33301000000000000000000000000000000000000000000000000000000000000002b4ae75affff7f20010000000402000000010000000000000000000000000000000000000000000000000000000000000000ffffffff0401670101ffffffff02a208f605000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac0000000000000000266a24aa21a9ed295d7a81b93fd66637f2f3b808000bf0392da5571f0fffd03f56bc39c916fff500000000020000000141ba32d7bcbe6a57cba91cfc9c6383cfc76223f32337dbc8a96e5b2c4b76c298000000006a473044022006ff7a4bd7bed6952bfa10e8cd673719c8e48eb11d34d0fe6865e47dc2a975f70220353ca7974268d4ecff9e06e540760632e665334e1a17912e812ce40e46ca52dd01210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffeffffff02002d3101000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac6ca2c404000000001976a9141f0ab9ac8f955709b1993552bd50148877a2079488ac660000000200000001b815f651c2292c9bc0356b659484e059e82ca67d11eba050c8ef6f163c2705f0000000006a47304402201704ef6214d38aeab6b35c3fe998417dafdc342c92e9d51996b797a0fa2a30c40220127490ba4a01a297a9b58ad1f4ab26f16d14dd6f1cf47956f1109b690552ce0f01210224039cf271585124d6b4f830a193dda079afef8a18367435dd019e0703d81099feffffff026c1b3101000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac00879303000000001976a91476b737037172fe748fe96837f3e54ccf2ba2d40088ac6600000002000000010e49f5bc4a85e186eeb82ec2be24d3c8d3712a33a13cc602cee25688b09991e9000000006a47304402206f66e9fe23d55e2cc4a33f8b460e139a7eebabb519fe2371945d145b640c191e02205ff71554877e9013b2ea73dd2c9543f0435caacb2e55f538f2d4c01b8ccf0de401210227d85ba011276cf25b51df6a188b75e604b38770a462b2d0e9fb2fc839ef5d3ffeffffff0186283101000000001976a9142b4569203694fc997e13f2c0a1383b9e16c77a0d88ac66000000"
], ],
"mocktime": 1525107225, "mocktime": 1525107225,
"stats": [ "stats": [
@ -148,7 +148,7 @@
"avgfee": 4500, "avgfee": 4500,
"avgfeerate": 20, "avgfeerate": 20,
"avgtxsize": 225, "avgtxsize": 225,
"blockhash": "6d90f5b8cc3cee6161dbb947ed14d675595081f8cc2ddbd1bd8f7753b00c3915", "blockhash": "1178ccaac0c261c98478b876245b6583b47cc7a26351eeb461774ceffacebed3",
"feerate_percentiles": [ "feerate_percentiles": [
20, 20,
20, 20,
@ -185,7 +185,7 @@
"avgfee": 3382, "avgfee": 3382,
"avgfeerate": 15, "avgfeerate": 15,
"avgtxsize": 213, "avgtxsize": 213,
"blockhash": "62ee9871eb89b88381ea7a6470558c7b57d7cc8ea6a0b50669df4170a8150f15", "blockhash": "54695999603b75016aad1699542edff16fdb44bb22bfcbdac007364646ac8c30",
"feerate_percentiles": [ "feerate_percentiles": [
6, 6,
6, 6,

10
test/functional/feature_fee_estimation.py
View file

@ -130,9 +130,9 @@ class EstimateFeeTest(BitcoinTestFramework):
# mine non-standard txs (e.g. txs with "dust" outputs) # mine non-standard txs (e.g. txs with "dust" outputs)
# Force fSendTrickle to true (via whitelist) # Force fSendTrickle to true (via whitelist)
self.extra_args = [ self.extra_args = [
["-acceptnonstdtxn", "-whitelist=127.0.0.1"], ["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-limitancestorcount=100"],
["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=68000"], ["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=68000", "-limitancestorcount=100"],
["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=32000"], ["-acceptnonstdtxn", "-whitelist=127.0.0.1", "-blockmaxweight=32000", "-limitancestorcount=100"],
] ]
def skip_test_if_missing_module(self): def skip_test_if_missing_module(self):
@ -166,10 +166,10 @@ class EstimateFeeTest(BitcoinTestFramework):
# resorting to tx's that depend on the mempool when those run out # resorting to tx's that depend on the mempool when those run out
for i in range(numblocks): for i in range(numblocks):
random.shuffle(self.confutxo) random.shuffle(self.confutxo)
for j in range(random.randrange(100 - 50, 100 + 50)): for j in range(random.randrange(50, 80)):
from_index = random.randint(1, 2) from_index = random.randint(1, 2)
(txhex, fee) = small_txpuzzle_randfee(self.nodes[from_index], self.confutxo, (txhex, fee) = small_txpuzzle_randfee(self.nodes[from_index], self.confutxo,
self.memutxo, Decimal("0.005"), min_fee, min_fee) self.memutxo, Decimal("0.0015"), min_fee, min_fee)
tx_kbytes = (len(txhex) // 2) / 1000.0 tx_kbytes = (len(txhex) // 2) / 1000.0
self.fees_per_kb.append(float(fee) / tx_kbytes) self.fees_per_kb.append(float(fee) / tx_kbytes)
self.sync_mempools(wait=.1) self.sync_mempools(wait=.1)

2
test/functional/mempool_packages.py
View file

@ -275,7 +275,7 @@ class MempoolPackagesTest(BitcoinTestFramework):
for i in range(6): for i in range(6):
(txid, sent_value) = self.chain_transaction(self.nodes[0], txid, vout, value, fee, 1) (txid, sent_value) = self.chain_transaction(self.nodes[0], txid, vout, value, fee, 1)
vout = 0 vout = 0
value = max(sent_value, 0.00000001) value = max(sent_value, 0.000001)
# Mine these in a block # Mine these in a block
self.nodes[0].generate(1) self.nodes[0].generate(1)

3
test/functional/test_framework/test_framework.py
View file

@ -312,7 +312,8 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
self.import_deterministic_coinbase_privkeys() self.import_deterministic_coinbase_privkeys()
if not self.setup_clean_chain: if not self.setup_clean_chain:
for n in self.nodes: for n in self.nodes:
assert_equal(n.getblockchaininfo()["blocks"], 199) while n.getblockchaininfo()["blocks"] < 199:
time.sleep(1)
# To ensure that all nodes are out of IBD, the most recent block # To ensure that all nodes are out of IBD, the most recent block
# must have a timestamp not too old (see IsInitialBlockDownload()). # must have a timestamp not too old (see IsInitialBlockDownload()).
self.log.debug('Generate a block with current time') self.log.debug('Generate a block with current time')

2
test/functional/test_framework/util.py
View file

@ -401,7 +401,7 @@ def sync_blocks(rpc_connections, *, wait=1, timeout=60):
time.sleep(wait) time.sleep(wait)
raise AssertionError("Block sync timed out:{}".format("".join("\n {!r}".format(b) for b in best_hash))) raise AssertionError("Block sync timed out:{}".format("".join("\n {!r}".format(b) for b in best_hash)))
def sync_mempools(rpc_connections, *, wait=1, timeout=60, flush_scheduler=True): def sync_mempools(rpc_connections, *, wait=1, timeout=120, flush_scheduler=True):
""" """
Wait until everybody has the same transactions in their memory Wait until everybody has the same transactions in their memory
pools pools

2
test/functional/test_runner.py
View file

@ -197,7 +197,7 @@ BASE_SCRIPTS = [
'feature_uacomment.py', 'feature_uacomment.py',
'wallet_coinbase_category.py', 'wallet_coinbase_category.py',
'feature_filelock.py', 'feature_filelock.py',
'p2p_dos_header_tree.py', # 'p2p_dos_header_tree.py', can't do: relies on bitcoin's testnet checkpoint
'p2p_unrequested_blocks.py', 'p2p_unrequested_blocks.py',
'feature_includeconf.py', 'feature_includeconf.py',
'rpc_deriveaddresses.py', 'rpc_deriveaddresses.py',