diff --git a/test/functional/feature_taphash_pegins_issuances.py b/test/functional/feature_taphash_pegins_issuances.py index dbcba17c68..e4716e8ebc 100755 --- a/test/functional/feature_taphash_pegins_issuances.py +++ b/test/functional/feature_taphash_pegins_issuances.py @@ -80,7 +80,7 @@ class TapHashPeginTest(BitcoinTestFramework): self.nodes[0].sendrawtransaction(signed_raw_tx['hex']) tx = tx_from_hex(signed_raw_tx['hex']) tx.rehash() - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) last_blk = self.nodes[0].getblock(self.nodes[0].getbestblockhash()) assert(tx.hash in last_blk['tx']) @@ -95,7 +95,7 @@ class TapHashPeginTest(BitcoinTestFramework): peg_id = self.nodes[0].sendtoaddress(fund_info["mainchain_address"], 1) raw_peg_tx = self.nodes[0].gettransaction(peg_id)["hex"] peg_txid = self.nodes[0].sendrawtransaction(raw_peg_tx) - self.nodes[0].generate(101) + self.generate(self.nodes[0], 101) peg_prf = self.nodes[0].gettxoutproof([peg_txid]) claim_script = fund_info["claim_script"] @@ -126,7 +126,7 @@ class TapHashPeginTest(BitcoinTestFramework): assert(verify_schnorr(pub_tweak, sig, msg)) # Since we add in/outputs the min feerate is no longer maintained. self.nodes[0].sendrawtransaction(hexstring = raw_claim.serialize().hex()) - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) last_blk = self.nodes[0].getblock(self.nodes[0].getbestblockhash()) raw_claim.rehash() assert(raw_claim.hash in last_blk['tx']) @@ -166,15 +166,18 @@ class TapHashPeginTest(BitcoinTestFramework): assert(verify_schnorr(pub_tweak, sig, msg)) # Since we add in/outputs the min feerate is no longer maintained. self.nodes[0].sendrawtransaction(hexstring = issued_tx.serialize().hex()) - self.nodes[0].generate(1) + self.generate(self.nodes[0], 1) last_blk = self.nodes[0].getblock(self.nodes[0].getbestblockhash()) issued_tx.rehash() assert(issued_tx.hash in last_blk['tx']) def run_test(self): - self.nodes[0].generate(101) + self.generate(self.nodes[0], 101) self.wait_until(lambda: self.nodes[0].getblockcount() == 101, timeout=5) + # spend the initialfreecoins to node0, to fix bad-txns-inputs-missingorspent error + self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 50) + self.generate(self.nodes[0], 1) self.log.info("Testing sighash taproot pegins") # Note that this does not test deposit to taproot pegin addresses # because there is no support for taproot pegins in rpc. The current rpc assumes diff --git a/test/functional/feature_tapscript_opcodes.py b/test/functional/feature_tapscript_opcodes.py index 5dc3c0d45c..8772a08d72 100755 --- a/test/functional/feature_tapscript_opcodes.py +++ b/test/functional/feature_tapscript_opcodes.py @@ -258,7 +258,7 @@ class TapHashPeginTest(BitcoinTestFramework): def run_test(self): self.generate(self.nodes[0], 101) self.wait_until(lambda: self.nodes[0].getblockcount() == 101, timeout=5) - # spend the initialfreecoins to node0, to fix bad-txns-inputs-missingorspent error when creating the first taproot utxo + # ELEMENTS: spend the initialfreecoins to node0, to fix bad-txns-inputs-missingorspent error when creating the first taproot utxo self.nodes[0].sendtoaddress(self.nodes[0].getnewaddress(), 50) self.generate(self.nodes[0], 1) diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index a58a4e98dc..5aac4cbb54 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -143,8 +143,7 @@ BASE_SCRIPTS = [ 'feature_taproot.py', 'rpc_signer.py', 'wallet_signer.py --descriptors', - # ELEMENTS: FIXME failing tests - # 'feature_taphash_pegins_issuances.py', + 'feature_taphash_pegins_issuances.py', 'feature_tapscript_opcodes.py', # vv Tests less than 60s vv 'p2p_sendheaders.py',