GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #621: Make fedpeg test compatible with bitcoind v0.18.0 parent

Browse source 
2939b5d Make fedpeg test compatible with bitcoind v0.18.0 parent (Steven Roose)

Pull request description:

Tree-SHA512: c1fd6f0acf53957e1bb3df4ae87081b875b52046118fba1c79b279a3bfa672ce344225bac2d3eacdbae6b681d5fa48147ddd7aa8b92181049ab60acea804aa3b
This commit is contained in:
Gregory Sanders 2019-05-14 09:32:09 -04:00
commit cd0a56a5d1
No known key found for this signature in database
GPG key ID: F3F68E2D86A48FDB
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/functional/feature_fedpeg.py
View file

@ -187,7 +187,7 @@ class FedPegTest(BitcoinTestFramework):
time.sleep(2)
proof = parent.gettxoutproof([txid1])
raw = parent.getrawtransaction(txid1)
raw = parent.gettransaction(txid1)["hex"]
print("Attempting peg-ins")
# First attempt fails the consensus check but gives useful result
@ -330,7 +330,7 @@ class FedPegTest(BitcoinTestFramework):
txid = parent.sendtoaddress(addrs["mainchain_address"], 1)
parent.generate(1)
proof = parent.gettxoutproof([txid])
raw = parent.getrawtransaction(txid)
raw = parent.gettransaction(txid)["hex"]
if i % 2 == 0:
parent.generate(11)
pegtxs += [sidechain.claimpegin(raw, proof)]
@ -411,7 +411,7 @@ class FedPegTest(BitcoinTestFramework):
txid = parent.sendtoaddress(addr, 1)
parent.generate(12)
proof = parent.gettxoutproof([txid])
raw = parent.getrawtransaction(txid)
raw = parent.gettransaction(txid)["hex"]
sidechain.claimpegin(raw, proof) # stuck peg
sidechain.generate(1)
print("Waiting to ensure block is being rejected by sidechain2")