mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Fix test/functional/mining_basic which broke in merge of bitcoin/bitcoin#24753 in 372f1a3c25.
Please review the last merge (not this commit) carefully. The bitcoin merge of bitcoin/bitcoin#24753 did not lead to any changes in the mining_basic functional test, so it's possible I made a mistake which caused this test to be affected.
This commit is contained in:
parent
81d22754ea
commit
c40923460a
1 changed files with 1 additions and 1 deletions
|
|
@ -103,7 +103,7 @@ class MiningTest(BitcoinTestFramework):
|
|||
witness_root = CBlock.get_merkle_root([ser_uint256(0),
|
||||
ser_uint256(txid)])
|
||||
script = get_witness_script(witness_root, 0)
|
||||
assert_equal(script.hex(), "6a24aa21a9ed3160175963f85aa4d48b96b0b1c16eb02693d2ee908f73391e78a73747722e72") # ELEMENTS: use `script` to placate linter
|
||||
assert_equal(script.hex(), "6a24aa21a9ed6e1779becc5d94c2a6ff5407450f666e3b76e75786ec61feee3c8a21a9aef6ad") # ELEMENTS: use `script` to placate linter
|
||||
|
||||
# ELEMENTS: The following assertion fails because
|
||||
# (1) Elements appears to use a different merkle tree computation than Bitcoin here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue