Skip to content

Commit

Permalink
Merge #621: Make fedpeg test compatible with bitcoind v0.18.0 parent
Browse files Browse the repository at this point in the history
2939b5d Make fedpeg test compatible with bitcoind v0.18.0 parent (Steven Roose)

Pull request description:

Tree-SHA512: c1fd6f0acf53957e1bb3df4ae87081b875b52046118fba1c79b279a3bfa672ce344225bac2d3eacdbae6b681d5fa48147ddd7aa8b92181049ab60acea804aa3b
  • Loading branch information
instagibbs committed May 14, 2019
2 parents 879b64b + 2939b5d commit cd0a56a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions test/functional/feature_fedpeg.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def run_test(self):
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
Expand Down Expand Up @@ -330,7 +330,7 @@ def run_test(self):
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)]
Expand Down Expand Up @@ -411,7 +411,7 @@ def run_test(self):
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")
Expand Down

0 comments on commit cd0a56a

Please sign in to comment.