Merge #20876: test: Replace getmempoolentry with testmempoolaccept in MiniWallet

faabc26a61 test: Replace getmempoolentry with testmempoolaccept in MiniWallet (MarcoFalke)

Pull request description:

  This is a refactor to not use the return value of `sendrawtransaction` and `getmempoolentry` with the goal that submitting the tx to the mempool will become optional.

ACKs for top commit:
  mjdietzx:
    ACK faabc26a61

Tree-SHA512: 4260a59e65fed1c807530dad23f1996ba6e881bcce91995f5b498a0be6001f67b3e0251507c8801750fe105410147c68bb2f393ebe678c6a3a4d045e5d72fc19
This commit is contained in:
MarcoFalke 2021-01-11 08:57:23 +01:00
commit 9c0b76c709
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25

View file

@ -71,9 +71,9 @@ class MiniWallet:
tx.wit.vtxinwit[0].scriptWitness.stack = [CScript([OP_TRUE])]
tx_hex = tx.serialize().hex()
txid = from_node.sendrawtransaction(tx_hex)
self._utxos.append({'txid': txid, 'vout': 0, 'value': send_value})
tx_info = from_node.getmempoolentry(txid)
tx_info = from_node.testmempoolaccept([tx_hex])[0]
self._utxos.append({'txid': tx_info['txid'], 'vout': 0, 'value': send_value})
from_node.sendrawtransaction(tx_hex)
assert_equal(tx_info['vsize'], vsize)
assert_equal(tx_info['fee'], fee)
return {'txid': txid, 'wtxid': tx_info['wtxid'], 'hex': tx_hex}
assert_equal(tx_info['fees']['base'], fee)
return {'txid': tx_info['txid'], 'wtxid': from_node.decoderawtransaction(tx_hex)['hash'], 'hex': tx_hex}