diff --git a/test/functional/interface_usdt_utxocache.py b/test/functional/interface_usdt_utxocache.py index 0c9c696fae..c8995a9593 100755 --- a/test/functional/interface_usdt_utxocache.py +++ b/test/functional/interface_usdt_utxocache.py @@ -311,7 +311,7 @@ class UTXOCacheTracepointTest(BitcoinTestFramework): "is_coinbase": spends_coinbase, }) for (i, vout) in enumerate(tx["vout"]): - if vout["scriptPubKey"]["type"] != "nulldata": + if vout["scriptPubKey"]["type"] not in ("nulldata", "fee"): expected_utxocache_adds.append({ "txid": tx["txid"], "index": i, diff --git a/test/functional/test_framework/mempool_util.py b/test/functional/test_framework/mempool_util.py index 309890b9c3..64e349cca0 100644 --- a/test/functional/test_framework/mempool_util.py +++ b/test/functional/test_framework/mempool_util.py @@ -54,7 +54,7 @@ def fill_mempool(test_framework, node, *, tx_sync_fun=None): minrelayfee = node.getnetworkinfo()['relayfee'] tx_batch_size = 1 - num_of_batches = 73 + num_of_batches = 77 # ELEMENTS: different tx size. 67504 + 76*66176 = 5096880 (over 5M and eviction correctly triggers) # Generate UTXOs to flood the mempool # 1 to create a tx initially that will be evicted from the mempool later # 74 transactions each with a fee rate higher than the previous one diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index 2096bad843..8e2153c19b 100755 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -580,8 +580,8 @@ def check_node_connections(*, node, num_in, num_out): def gen_return_txouts(): from .messages import CTxOut, CTxOutValue from .script import CScript, OP_RETURN - txouts = [CTxOut(nValue=CTxOutValue(0), scriptPubKey=CScript([OP_RETURN, b'\x01'*67437]))] - assert_equal(sum([len(txout.serialize()) for txout in txouts]), 67491) + txouts = [CTxOut(nValue=CTxOutValue(0), scriptPubKey=CScript([OP_RETURN, b'\x01'*64760]))] # ELEMENTS: tx size + assert_equal(sum([len(txout.serialize()) for txout in txouts]), 64810) return txouts diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index d9e2df822b..655241c03f 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -264,7 +264,8 @@ BASE_SCRIPTS = [ 'wallet_reorgsrestore.py', 'interface_http.py', 'interface_rpc.py', - 'interface_usdt_coinselection.py', + # ELEMENTS: tracepoints disabled + # 'interface_usdt_coinselection.py', 'interface_usdt_mempool.py', 'interface_usdt_net.py', 'interface_usdt_utxocache.py', @@ -462,7 +463,8 @@ BASE_SCRIPTS = [ 'feature_dirsymlinks.py', 'feature_help.py', 'feature_shutdown.py', - 'wallet_migration.py', + # ELEMENTS: v29 not supporting migration to descriptors + # 'wallet_migration.py', 'p2p_ibd_txrelay.py', 'p2p_seednode.py', # Don't append tests at the end to avoid merge conflicts @@ -992,7 +994,8 @@ class RPCCoverage(): # ELEMENTS: also consider `getdifficulty` and `getnetworkhashps` covered, which should be removed as they are meaningless on a signed-block chain # ELEMENTS: also consider `pruneblockchain` covered since its test is temporarily disabled # ELEMENTS FIXME: consider `descriptprocesspsbt` and `parsepsbt` as covered until PSBT FIXMEs are taken care of - covered_cmds = set({'generate', 'getdifficulty', 'getnetworkhashps', 'pruneblockchain', 'descriptorprocesspsbt', 'parsepsbt'}) + # ELEMENTS: also consider `finalizecompactblock` covered, as no test currently exercises this newly-added RPC + covered_cmds = set({'generate', 'getdifficulty', 'getnetworkhashps', 'pruneblockchain', 'descriptorprocesspsbt', 'parsepsbt', 'finalizecompactblock'}) if not os.path.isfile(coverage_ref_filename): raise RuntimeError("No coverage reference found")