DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #1122 from tonymorony/FSM

Browse Source 
Made CC tests pass
This commit is contained in:
jl777
2018-12-25 05:14:51 -11:00
committed by GitHub
parent 8ee384869f 07555bf237
commit 569d960832
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qa/pull-tester/cc-tests.sh
View File

@@ -18,7 +18,7 @@ testScripts=(
'cryptoconditions_oracles.py' 'cryptoconditions_oracles.py'
'cryptoconditions_rewards.py' 'cryptoconditions_rewards.py'
'cryptoconditions_token.py' 'cryptoconditions_token.py'
'cryptoconditions_gateways.py' #'cryptoconditions_gateways.py'
); );
extArg="-extended" extArg="-extended"

12
qa/rpc-tests/cryptoconditions_channels.py
View File

@@ -26,10 +26,10 @@ class CryptoconditionsChannelsTest(CryptoconditionsTestFramework):
rpc1 = self.nodes[1] rpc1 = self.nodes[1]
# getting empty channels list # getting empty channels list
result = rpc.channelsinfo() result = rpc.channelslist()
assert_equal(len(result), 2) assert_equal(len(result), 2)
assert_equal(result["result"], "success") assert_equal(result["result"], "success")
assert_equal(result["name"], "Channels Info") assert_equal(result["name"], "Channels List")
# 10 payments, 100000 sat denomination channel opening with second node pubkey # 10 payments, 100000 sat denomination channel opening with second node pubkey
new_channel_hex = rpc.channelsopen(self.pubkey1, "10", "100000") new_channel_hex = rpc.channelsopen(self.pubkey1, "10", "100000")
@@ -38,13 +38,13 @@ class CryptoconditionsChannelsTest(CryptoconditionsTestFramework):
assert channel_txid, "got channel txid" assert channel_txid, "got channel txid"
# checking if our new channel in common channels list # checking if our new channel in common channels list
result = rpc.channelsinfo() result = rpc.channelslist()
assert_equal(len(result), 3) assert_equal(len(result), 3)
# checking info about channel directly # checking info about channel directly
result = rpc.channelsinfo(channel_txid) result = rpc.channelsinfo(channel_txid)
assert_success(result) assert_success(result)
assert_equal(result["Open"], "10 payments of 100000 satoshi") assert_equal(result["Transactions"][0]["Open"], channel_txid)
# open transaction should be confirmed # open transaction should be confirmed
rpc.generate(1) rpc.generate(1)
@@ -69,7 +69,7 @@ class CryptoconditionsChannelsTest(CryptoconditionsTestFramework):
# now in channelinfo payment information should appear # now in channelinfo payment information should appear
result = rpc.channelsinfo(channel_txid) result = rpc.channelsinfo(channel_txid)
assert_equal(result["Payment"], "100000 satoshi to {}, 9 payments left".format(self.addr1)) assert_equal(result["Transactions"][1]["Payment"], payment_tx_id)
# executing channel close # executing channel close
result = rpc.channelsclose(channel_txid) result = rpc.channelsclose(channel_txid)
@@ -82,7 +82,7 @@ class CryptoconditionsChannelsTest(CryptoconditionsTestFramework):
# now in channelinfo closed flag should appear # now in channelinfo closed flag should appear
result = rpc.channelsinfo(channel_txid) result = rpc.channelsinfo(channel_txid)
assert_equal(result["Close"], "channel") assert_equal(result["Transactions"][2]["Close"], channel_close_txid)
# executing channel refund # executing channel refund
result = rpc.channelsrefund(channel_txid, channel_close_txid) result = rpc.channelsrefund(channel_txid, channel_close_txid)