fix mimblewimble#88 (mimblewimble#89)

quentinlesceller · Apr 24, 2019 · bff07eb · bff07eb
1 parent 47ee03c
commit bff07eb
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -15,7 +15,7 @@ failure_derive = "0.1"
 log = "0.4"
 uuid = { version = "0.7", features = ["serde", "v4"] }
 serde_json = "1"
-easy-jsonrpc = "0.4.1"
+easy-jsonrpc = "0.5.1"
 chrono = { version = "0.4.4", features = ["serde"] }
 
 grin_wallet_libwallet = { path = "../libwallet", version = "1.1.0-beta.2" }

diff --git a/api/src/foreign_rpc.rs b/api/src/foreign_rpc.rs
@@ -440,7 +440,7 @@ pub fn run_doctest_foreign(
 	let mut api_foreign = Foreign::new(wallet1.clone());
 	api_foreign.doctest_mode = true;
 	let foreign_api = &api_foreign as &dyn ForeignRpc;
-	Ok(foreign_api.handle_request(request))
+	Ok(foreign_api.handle_request(request).as_option())
 }
 
 #[doc(hidden)]

diff --git a/api/src/owner_rpc.rs b/api/src/owner_rpc.rs
@@ -1202,7 +1202,7 @@ pub fn run_doctest_owner(
 	let mut api_owner = Owner::new(wallet1.clone());
 	api_owner.doctest_mode = true;
 	let owner_api = &api_owner as &dyn OwnerRpc;
-	Ok(owner_api.handle_request(request))
+	Ok(owner_api.handle_request(request).as_option())
 }
 
 #[doc(hidden)]

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -29,7 +29,7 @@ tokio-retry = "0.1"
 uuid = { version = "0.7", features = ["serde", "v4"] }
 url = "1.7.0"
 chrono = { version = "0.4.4", features = ["serde"] }
-easy-jsonrpc = "0.4.1"
+easy-jsonrpc = "0.5.1"
 lazy_static = "1"
 
 grin_wallet_util = { path = "../util", version = "1.1.0-beta.2" }

diff --git a/controller/src/controller.rs b/controller/src/controller.rs
@@ -44,7 +44,7 @@ use uuid::Uuid;
 
 use crate::apiwallet::{Foreign, ForeignRpc, Owner, OwnerRpc};
 use easy_jsonrpc;
-use easy_jsonrpc::Handler;
+use easy_jsonrpc::{Handler, MaybeReply};
 
 lazy_static! {
 	pub static ref GRIN_OWNER_BASIC_REALM: HeaderValue =
@@ -687,10 +687,11 @@ where
 		Box::new(parse_body(req).and_then(move |val: serde_json::Value| {
 			let owner_api = &api as &dyn OwnerRpc;
 			match owner_api.handle_request(val) {
-				Some(r) => ok(r),
-				None => {
-					error!("OwnerAPI: call_api: failed with error");
-					err(ErrorKind::GenericError(format!("OwnerAPI Call Failed")).into())
+				MaybeReply::Reply(r) => ok(r),
+				MaybeReply::DontReply => {
+					// Since it's http, we need to return something. We return [] because jsonrpc
+					// clients will parse it as an empty batch response.
+					ok(serde_json::json!([]))
 				}
 			}
 		}))
@@ -866,10 +867,11 @@ where
 		Box::new(parse_body(req).and_then(move |val: serde_json::Value| {
 			let foreign_api = &api as &dyn ForeignRpc;
 			match foreign_api.handle_request(val) {
-				Some(r) => ok(r),
-				None => {
-					error!("ForeignAPI: call_api: failed with error");
-					err(ErrorKind::GenericError(format!("ForeignAPI Call Failed")).into())
+				MaybeReply::Reply(r) => ok(r),
+				MaybeReply::DontReply => {
+					// Since it's http, we need to return something. We return [] because jsonrpc
+					// clients will parse it as an empty batch response.
+					ok(serde_json::json!([]))
 				}
 			}
 		}))