aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/client.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2016-09-09 08:33:26 +0200
committerWladimir J. van der Laan <[email protected]>2016-09-09 08:33:54 +0200
commit666eaf03cf251832302fa5d358b1a6ca128db7e8 (patch)
tree77ba58aef22802188b1fe687ffc18b5bd289e739 /src/rpc/client.cpp
parentMerge #8525: Do not store witness txn in rejection cache (diff)
parentadd waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (diff)
downloaddiscoin-666eaf03cf251832302fa5d358b1a6ca128db7e8.tar.xz
discoin-666eaf03cf251832302fa5d358b1a6ca128db7e8.zip
Merge #8680: Address Travis spurious failures
d6a5dc4 add waitfornewblock/waitforblock/waitforblockheight rpcs and use them for tests (Cory Fields)
Diffstat (limited to 'src/rpc/client.cpp')
-rw-r--r--src/rpc/client.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 3003ea345..c14d9d674 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -46,6 +46,12 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "getbalance", 1 },
{ "getbalance", 2 },
{ "getblockhash", 0 },
+ { "waitforblockheight", 0 },
+ { "waitforblockheight", 1 },
+ { "waitforblock", 1 },
+ { "waitforblock", 2 },
+ { "waitfornewblock", 0 },
+ { "waitfornewblock", 1 },
{ "move", 2 },
{ "move", 3 },
{ "sendfrom", 2 },