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

Merge pull request #984 from letolabs/FSM

Browse Source 
Fsm
This commit is contained in:
jl777
2018-11-26 06:18:12 -11:00
committed by GitHub
parent 0ca564da8c 1617998925
commit fbb3490bfb
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qa/pull-tester/rpc-tests.sh
View File

@@ -11,6 +11,7 @@ export BITCOIND=${REAL_BITCOIND}
#Run the tests #Run the tests
testScripts=( testScripts=(
'ac_private.py'
'verushash.py' 'verushash.py'
'cryptoconditions.py' 'cryptoconditions.py'
'paymentdisclosure.py' 'paymentdisclosure.py'

1
src/rpc/server.cpp
View File

@@ -468,6 +468,7 @@ static const CRPCCommand vRPCCommands[] =
{ "tokens", "tokencancelask", &tokencancelask, true }, { "tokens", "tokencancelask", &tokencancelask, true },
{ "tokens", "tokenfillask", &tokenfillask, true }, { "tokens", "tokenfillask", &tokenfillask, true },
//{ "tokens", "tokenfillswap", &tokenfillswap, true }, //{ "tokens", "tokenfillswap", &tokenfillswap, true },
{ "tokens", "tokenconvert", &tokenconvert, true },
/* Address index */ /* Address index */
{ "addressindex", "getaddressmempool", &getaddressmempool, true }, { "addressindex", "getaddressmempool", &getaddressmempool, true },