Merge pull request #936 from evoskuil/master

Read pcin_value from bitcoind.rpc message.

Author: evoskuil

src/protocols/protocol_bitcoind_rpc.cpp

@@ -31,6 +31,7 @@ namespace node {
 using namespace system;
 using namespace network::rpc;
 using namespace network::http;
+using namespace network::monad;
 using namespace std::placeholders;
 using namespace boost::json;
 
@@ -130,32 +131,17 @@ void protocol_bitcoind_rpc::handle_receive_post(const code& ec,
     }
 
     const auto& body = post->body();
-    if (!body.contains<json_body::value_type>())
+    if (!body.contains<rpcin_value>())
     {
         send_not_acceptable(*post);
         return;
     }
 
-    request_t request{};
-    try
-    {
-        request = value_to<request_t>(body.get<json_body::value_type>().model);
-    }
-    catch (const boost::system::system_error& e)
-    {
-        send_bad_target(e.code(), *post);
-        return;
-    }
-    catch (...)
-    {
-        send_bad_target(error::unexpected_parse, *post);
-        return;
-    }
-
     // The post is saved off during asynchonous handling and used in send_json
     // to formulate response headers, isolating handlers from http semantics.
     set_request(post);
 
+    const auto& request = body.get<rpcin_value>().message;
     if (const auto code = rpc_dispatcher_.notify(request))
         stop(code);
 }