From 0f9cdb1c8bc8233d72961ed27232879f49a8d6ec Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Thu, 6 Dec 2012 20:22:02 -0800
Subject: [PATCH] Remove support for RPC style calls over websocket.

---
 src/cpp/ripple/WSConnection.h | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h
index cd5b17a631..b9285c31dc 100644
--- a/src/cpp/ripple/WSConnection.h
+++ b/src/cpp/ripple/WSConnection.h
@@ -38,7 +38,6 @@ public:
 	WSConnection(WSServerHandler<endpoint_type>* wshpHandler, connection_ptr cpConnection)
 		: mHandler(wshpHandler), mConnection(cpConnection), mNetwork(theApp->getOPs()) { ; }
 
-	
 	virtual ~WSConnection()
 	{
 		mNetwork.unsubTransactions(this);
@@ -70,33 +69,12 @@ public:
 			return jvResult;
 		}
 
-		RPCHandler mRPCHandler(&mNetwork, this);
+		RPCHandler	mRPCHandler(&mNetwork, this);
 		Json::Value	jvResult(Json::objectValue);
 
-		// XXX Temporarily support RPC style commands over websocket. Remove this.
-		if (jvRequest.isMember("params"))
-		{
-			RPCParser	rpParser;
-
-			Json::Value	jvRpcRequest	= rpParser.parseCommand(jvRequest["command"].asString(), jvRequest["params"]);
-
-			if (jvRpcRequest.isMember("error"))
-			{
-				jvResult		= jvRpcRequest;
-			}
-			else
-			{
-				jvResult["result"] = mRPCHandler.doCommand(
-					jvRpcRequest,
-					mHandler->getPublic() ? RPCHandler::GUEST : RPCHandler::ADMIN);
-			}
-		}
-		else
-		{
-			jvResult["result"] = mRPCHandler.doCommand(
-				jvRequest,
-				mHandler->getPublic() ? RPCHandler::GUEST : RPCHandler::ADMIN);
-		}
+		jvResult["result"] = mRPCHandler.doCommand(
+			jvRequest,
+			mHandler->getPublic() ? RPCHandler::GUEST : RPCHandler::ADMIN);
 
 		// Currently we will simply unwrap errors returned by the RPC
 		// API, in the future maybe we can make the responses
@@ -122,7 +100,6 @@ public:
 
 		return jvResult;
 	}
-
 };