From 5bd2894146764eb55963ee940e4df148f592dc59 Mon Sep 17 00:00:00 2001
From: Svyatoslav Nikolsky <svyatonik@gmail.com>
Date: Thu, 23 Nov 2017 16:47:08 +0300
Subject: [PATCH] Fixed build && test (#7128)

* fixed build && test

* fixed rpc tests
---
 dapps/src/apps/fetcher/mod.rs         | 2 +-
 dapps/src/tests/fetch.rs              | 5 +++--
 rpc/src/v1/tests/helpers/dapps.rs     | 1 +
 rpc/src/v1/tests/mocked/parity_set.rs | 2 +-
 rpc/src/v1/types/dapps.rs             | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dapps/src/apps/fetcher/mod.rs b/dapps/src/apps/fetcher/mod.rs
index e66c44eb6..c75569c51 100644
--- a/dapps/src/apps/fetcher/mod.rs
+++ b/dapps/src/apps/fetcher/mod.rs
@@ -306,7 +306,7 @@ mod tests {
 			version: "".into(),
 			author: "".into(),
 			icon_url: "".into(),
-			local_url: "".into(),
+			local_url: Some("".into()),
 		}, Default::default(), None);
 
 		// when
diff --git a/dapps/src/tests/fetch.rs b/dapps/src/tests/fetch.rs
index 9f181d364..69e407dfa 100644
--- a/dapps/src/tests/fetch.rs
+++ b/dapps/src/tests/fetch.rs
@@ -180,14 +180,15 @@ fn should_return_fetched_dapp_content() {
 	assert_security_headers_for_embed(&response2.headers);
 	assert_eq!(
 		response2.body,
-		r#"BE
+		r#"D2
 {
   "id": "9c94e154dab8acf859b30ee80fc828fb1d38359d938751b65db71d460588d82a",
   "name": "Gavcoin",
   "description": "Gavcoin",
   "version": "1.0.0",
   "author": "",
-  "iconUrl": "icon.png"
+  "iconUrl": "icon.png",
+  "localUrl": null
 }
 0
 
diff --git a/rpc/src/v1/tests/helpers/dapps.rs b/rpc/src/v1/tests/helpers/dapps.rs
index 6a7182dd0..10c54cf4c 100644
--- a/rpc/src/v1/tests/helpers/dapps.rs
+++ b/rpc/src/v1/tests/helpers/dapps.rs
@@ -32,6 +32,7 @@ impl DappsService for TestDappsService {
 			version: "0.1".into(),
 			author: "Parity Technologies Ltd".into(),
 			icon_url: "title.png".into(),
+			local_url: None,
 		}]
 	}
 
diff --git a/rpc/src/v1/tests/mocked/parity_set.rs b/rpc/src/v1/tests/mocked/parity_set.rs
index ed27862ac..f571feeeb 100644
--- a/rpc/src/v1/tests/mocked/parity_set.rs
+++ b/rpc/src/v1/tests/mocked/parity_set.rs
@@ -250,7 +250,7 @@ fn rpc_parity_set_dapps_list() {
 	io.extend_with(parity_set_client(&client, &miner, &updater, &network).to_delegate());
 
 	let request = r#"{"jsonrpc": "2.0", "method": "parity_dappsList", "params":[], "id": 1}"#;
-	let response = r#"{"jsonrpc":"2.0","result":[{"author":"Parity Technologies Ltd","description":"A skeleton dapp","iconUrl":"title.png","id":"skeleton","name":"Skeleton","version":"0.1"}],"id":1}"#;
+	let response = r#"{"jsonrpc":"2.0","result":[{"author":"Parity Technologies Ltd","description":"A skeleton dapp","iconUrl":"title.png","id":"skeleton","localUrl":null,"name":"Skeleton","version":"0.1"}],"id":1}"#;
 
 	assert_eq!(io.handle_request_sync(request), Some(response.to_owned()));
 }
diff --git a/rpc/src/v1/types/dapps.rs b/rpc/src/v1/types/dapps.rs
index 907a6c2cc..418717fcc 100644
--- a/rpc/src/v1/types/dapps.rs
+++ b/rpc/src/v1/types/dapps.rs
@@ -52,7 +52,7 @@ mod tests {
 			version: "0.1".into(),
 			author: "Parity Technologies Ltd".into(),
 			icon_url: "title.png".into(),
-			local_url: "http://localhost:5000".into(),
+			local_url: Some("http://localhost:5000".into()),
 		};
 
 		let serialized = serde_json::to_string(&dapp).unwrap();