scripted-diff: test: rename CTransaction .getwtxid() -> wtxid_hex for consistency
-BEGIN VERIFY SCRIPT- sed -i "s|def getwtxid|@property\n def wtxid_hex|g" ./test/functional/test_framework/messages.py sed -i "s|getwtxid()|wtxid_hex|g" $(git grep -l getwtxid) -END VERIFY SCRIPT-
This commit is contained in:
1 parent
81af4334e8
commit
472f3770ae
20 files changed
+66
-65
No files matched your search
@@ -336,7 +336,7 @@ class SegWitTest(BitcoinTestFramework):
|
||||
|
||||
# Verify the hash with witness differs from the txid
|
||||
# (otherwise our testing framework must be broken!)
|
||||
assert_not_equal(tx.txid_hex, tx.getwtxid())
|
||||
assert_not_equal(tx.txid_hex, tx.wtxid_hex)
|
||||
|
||||
# Construct a block that includes the transaction.
|
||||
block = self.build_next_block()
|
||||
@@ -615,7 +615,7 @@ class SegWitTest(BitcoinTestFramework):
|
||||
assert_equal(testres3,
|
||||
[{
|
||||
'txid': tx3.txid_hex,
|
||||
'wtxid': tx3.getwtxid(),
|
||||
'wtxid': tx3.wtxid_hex,
|
||||
'allowed': True,
|
||||
'vsize': tx3.get_vsize(),
|
||||
'fees': {
|
||||
@@ -633,7 +633,7 @@ class SegWitTest(BitcoinTestFramework):
|
||||
assert_equal(testres3_replaced,
|
||||
[{
|
||||
'txid': tx3.txid_hex,
|
||||
'wtxid': tx3.getwtxid(),
|
||||
'wtxid': tx3.wtxid_hex,
|
||||
'allowed': True,
|
||||
'vsize': tx3.get_vsize(),
|
||||
'fees': {
|
||||
@@ -1258,7 +1258,7 @@ class SegWitTest(BitcoinTestFramework):
|
||||
# Test that getrawtransaction returns correct witness information
|
||||
# hash, size, vsize
|
||||
raw_tx = self.nodes[0].getrawtransaction(tx3.txid_hex, 1)
|
||||
assert_equal(raw_tx["hash"], tx3.getwtxid())
|
||||
assert_equal(raw_tx["hash"], tx3.wtxid_hex)
|
||||
assert_equal(raw_tx["size"], len(tx3.serialize_with_witness()))
|
||||
vsize = tx3.get_vsize()
|
||||
assert_equal(raw_tx["vsize"], vsize)
|
||||
|
||||
Reference in new issue
Block a user