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

Merge branch 'FSM' into jl777

Browse Source 
# Conflicts:
#	src/cc/rogue/main.c
This commit is contained in:
jl777
2019-03-06 03:36:36 -11:00
parent e670687db5
commit fb89be82f1
8 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,8 @@ class CryptoconditionsChannelsTest(CryptoconditionsTestFramework):
result = rpc.channelsaddress(self.pubkey)
assert_success(result)
# test that additional CCaddress key is returned
for x in ['myCCaddress', 'ChannelsCCaddress', 'Channelsmarker', 'myaddress', 'CCaddress']:
for x in ['ChannelsCC1of2TokensAddress', 'myCCAddress(Channels)', 'ChannelsCC1of2Address', 'myAddress', \
'myCCaddress', 'ChannelsNormalAddress', 'PubkeyCCaddress(Channels)', 'ChannelsCCAddress']:
assert_equal(result[x][0], 'R')
# getting empty channels list