Skip to content

Commit

Permalink
[backport#16078] replace tx hash with txid in test rawtransaction
Browse files Browse the repository at this point in the history
Summary:
Comment by @sipa:
> txid is correct here, as it's about arguments to the gettransansaction RPC.

This is a partial backport of Core [[bitcoin/bitcoin#16078 | PR16078]]
Commit bitcoin/bitcoin@a65dafa

The next commit is not needed as its changes are overwritten in D8027 / PR16251

See D1556 for why we have additional lines changed.

Test Plan: `ninja && ninja && test/functional/test_runner.py rpc_rawtransaction.py`

Reviewers: O1 Bitcoin ABC, #bitcoin_abc, deadalnix

Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D8050
  • Loading branch information
LongShao007 authored and PiRK committed Oct 22, 2020
1 parent bf580dc commit 8244813
Showing 1 changed file with 18 additions and 17 deletions.
35 changes: 18 additions & 17 deletions test/functional/rpc_rawtransaction.py
Expand Up @@ -430,45 +430,46 @@ def run_test(self):

# getrawtransaction tests
# 1. valid parameters - only supply txid
txHash = rawTx["hash"]
txId = rawTx["txid"]
assert_equal(
self.nodes[0].getrawtransaction(txHash), rawTxSigned['hex'])
self.nodes[0].getrawtransaction(txId), rawTxSigned['hex'])

# 2. valid parameters - supply txid and 0 for non-verbose
assert_equal(
self.nodes[0].getrawtransaction(txHash, 0), rawTxSigned['hex'])
self.nodes[0].getrawtransaction(txId, 0), rawTxSigned['hex'])

# 3. valid parameters - supply txid and False for non-verbose
assert_equal(self.nodes[0].getrawtransaction(
txHash, False), rawTxSigned['hex'])
assert_equal(self.nodes[0].getrawtransaction(txId, False),
rawTxSigned['hex'])

# 4. valid parameters - supply txid and 1 for verbose.
# We only check the "hex" field of the output so we don't need to
# update this test every time the output format changes.
assert_equal(self.nodes[0].getrawtransaction(
txHash, 1)["hex"], rawTxSigned['hex'])
assert_equal(self.nodes[0].getrawtransaction(txId, 1)["hex"],
rawTxSigned['hex'])

# 5. valid parameters - supply txid and True for non-verbose
assert_equal(self.nodes[0].getrawtransaction(
txHash, True)["hex"], rawTxSigned['hex'])
assert_equal(self.nodes[0].getrawtransaction(txId, True)["hex"],
rawTxSigned['hex'])

# 6. invalid parameters - supply txid and string "Flase"
assert_raises_rpc_error(
-1, "not a boolean", self.nodes[0].getrawtransaction, txHash, "False")
assert_raises_rpc_error(-1, "not a boolean",
self.nodes[0].getrawtransaction,
txId, "Flase")

# 7. invalid parameters - supply txid and empty array
assert_raises_rpc_error(
-1, "not a boolean", self.nodes[0].getrawtransaction, txHash, [])
assert_raises_rpc_error(-1, "not a boolean",
self.nodes[0].getrawtransaction, txId, [])

# 8. invalid parameters - supply txid and empty dict
assert_raises_rpc_error(
-1, "not a boolean", self.nodes[0].getrawtransaction, txHash, {})
-1, "not a boolean", self.nodes[0].getrawtransaction, txId, {})

# Sanity checks on verbose getrawtransaction output
rawTxOutput = self.nodes[0].getrawtransaction(txHash, True)
rawTxOutput = self.nodes[0].getrawtransaction(txId, True)
assert_equal(rawTxOutput["hex"], rawTxSigned["hex"])
assert_equal(rawTxOutput["txid"], txHash)
assert_equal(rawTxOutput["hash"], txHash)
assert_equal(rawTxOutput["txid"], txId)
assert_equal(rawTxOutput["hash"], txId)
assert_greater_than(rawTxOutput["size"], 300)
assert_equal(rawTxOutput["version"], 0x02)
assert_equal(rawTxOutput["locktime"], 0)
Expand Down

0 comments on commit 8244813

Please sign in to comment.