From 83a26499464e31137f3c621bb6e9b6a4cc62905e Mon Sep 17 00:00:00 2001
From: Quentin Le Sceller <q.lesceller@gmail.com>
Date: Tue, 28 Jan 2020 17:45:38 -0500
Subject: [PATCH] Revert "Resolve JSON RPC 2.0 non-compliance (#3209)" (#3212)

This reverts commit 15278021dc911365c9eec047085687fd55d350df.
---
 servers/src/mining/stratumserver.rs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/servers/src/mining/stratumserver.rs b/servers/src/mining/stratumserver.rs
index 8e5fb449..190c8ee4 100644
--- a/servers/src/mining/stratumserver.rs
+++ b/servers/src/mining/stratumserver.rs
@@ -52,17 +52,9 @@ type Tx = mpsc::UnboundedSender<String>;
 // http://www.jsonrpc.org/specification
 // RPC Methods
 
-/// Represents a compliant JSON RPC 2.0 id.
-/// Valid id: Integer, String.
-#[derive(Serialize, Deserialize, Debug)]
-enum JsonId {
-	NumId(u32),
-	StrId(String),
-}
-
 #[derive(Serialize, Deserialize, Debug)]
 struct RpcRequest {
-	id: JsonId,
+	id: String,
 	jsonrpc: String,
 	method: String,
 	params: Option<Value>,
@@ -70,7 +62,7 @@ struct RpcRequest {
 
 #[derive(Serialize, Deserialize, Debug)]
 struct RpcResponse {
-	id: JsonId,
+	id: String,
 	jsonrpc: String,
 	method: String,
 	result: Option<Value>,
@@ -509,7 +501,7 @@ impl Handler {
 		// Issue #1159 - use a serde_json Value type to avoid extra quoting
 		let job_template_value: Value = serde_json::from_str(&job_template_json).unwrap();
 		let job_request = RpcRequest {
-			id: JsonId::StrId(String::from("Stratum")),
+			id: String::from("Stratum"),
 			jsonrpc: String::from("2.0"),
 			method: String::from("job"),
 			params: Some(job_template_value),