aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-08-13 09:42:48 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-08-13 09:42:50 -0400
commitf083ec13c35a7fe257b0eb0249d6ba42212e5919 (patch)
tree1ffd4ca3b5ea10fdb5da44f1ad12b491ba272e63
parent58efc49b954f145ce39fc1047aca3534b7100a4f (diff)
parent2da54f5a66f91306c064d685bffcee2062b6ebd2 (diff)
downloadbitcoin-f083ec13c35a7fe257b0eb0249d6ba42212e5919.tar.xz
Merge #13938: refactoring: Cleanup StartRest()
2da54f5a66 Cleanup StartRest() (DesWurstes) Pull request description: Tree-SHA512: 7e907315009c0351b7a3347ec13b6727abd12fe722d51cc061cb635ea20f9a550af5f50dc364c4313501b0dfc3696bcfa26a2a5f0170a4b5808624e043085d29
-rw-r--r--src/httprpc.h2
-rw-r--r--src/init.cpp3
-rw-r--r--src/rest.cpp3
3 files changed, 3 insertions, 5 deletions
diff --git a/src/httprpc.h b/src/httprpc.h
index 193f8d617a..2230a8ca4e 100644
--- a/src/httprpc.h
+++ b/src/httprpc.h
@@ -23,7 +23,7 @@ void StopHTTPRPC();
/** Start HTTP REST subsystem.
* Precondition; HTTP and RPC has been started.
*/
-bool StartREST();
+void StartREST();
/** Interrupt RPC REST subsystem.
*/
void InterruptREST();
diff --git a/src/init.cpp b/src/init.cpp
index 5c29736913..482107c06f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -736,8 +736,7 @@ static bool AppInitServers()
StartRPC();
if (!StartHTTPRPC())
return false;
- if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE) && !StartREST())
- return false;
+ if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE)) StartREST();
StartHTTPServer();
return true;
}
diff --git a/src/rest.cpp b/src/rest.cpp
index b81a6f9c5f..12358cf50d 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -591,11 +591,10 @@ static const struct {
{"/rest/getutxos", rest_getutxos},
};
-bool StartREST()
+void StartREST()
{
for (unsigned int i = 0; i < ARRAYLEN(uri_prefixes); i++)
RegisterHTTPHandler(uri_prefixes[i].prefix, false, uri_prefixes[i].handler);
- return true;
}
void InterruptREST()