2.1.x url fix (#237)

* Fix URL Compatibility with 2.0.0 (#236) * fix url scheme for consistency with 2.0.0 * rustfmt * remove URL lib and go back to parsing strings for the dest url * rustmft * update version number
mimblewimble · Oct 9, 2019 · dabdea9 · dabdea9
1 parent 0f2d8f8
commit dabdea9
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 79 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet"
-version = "2.1.0-beta.3"
+version = "2.1.0-beta.4"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
 license = "Apache-2.0"
@@ -30,13 +30,13 @@ log = "0.4"
 linefeed = "0.5"
 semver = "0.9"
 
-grin_wallet_api = { path = "./api", version = "2.1.0-beta.3" }
-grin_wallet_impls = { path = "./impls", version = "2.1.0-beta.3" }
-grin_wallet_libwallet = { path = "./libwallet", version = "2.1.0-beta.3" }
-grin_wallet_controller = { path = "./controller", version = "2.1.0-beta.3" }
-grin_wallet_config = { path = "./config", version = "2.1.0-beta.3" }
+grin_wallet_api = { path = "./api", version = "2.1.0-beta.4" }
+grin_wallet_impls = { path = "./impls", version = "2.1.0-beta.4" }
+grin_wallet_libwallet = { path = "./libwallet", version = "2.1.0-beta.4" }
+grin_wallet_controller = { path = "./controller", version = "2.1.0-beta.4" }
+grin_wallet_config = { path = "./config", version = "2.1.0-beta.4" }
 
-grin_wallet_util = { path = "./util", version = "2.1.0-beta.3" }
+grin_wallet_util = { path = "./util", version = "2.1.0-beta.4" }
 
 [build-dependencies]
 built = "0.3"

diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_api"
-version = "2.1.0-beta.3"
+version = "2.1.0-beta.4"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Grin Wallet API"
 license = "Apache-2.0"
@@ -23,10 +23,10 @@ chrono = { version = "0.4.4", features = ["serde"] }
 ring = "0.13"
 base64 = "0.9"
 
-grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.3" }
-grin_wallet_config = { path = "../config", version = "2.1.0-beta.3" }
-grin_wallet_impls = { path = "../impls", version = "2.1.0-beta.3" }
-grin_wallet_util = { path = "../util", version = "2.1.0-beta.3" }
+grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.4" }
+grin_wallet_config = { path = "../config", version = "2.1.0-beta.4" }
+grin_wallet_impls = { path = "../impls", version = "2.1.0-beta.4" }
+grin_wallet_util = { path = "../util", version = "2.1.0-beta.4" }
 
 [dev-dependencies]
 serde_json = "1"

diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_config"
-version = "2.1.0-beta.3"
+version = "2.1.0-beta.4"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ serde_derive = "1"
 toml = "0.4"
 dirs = "1.0.3"
 
-grin_wallet_util = { path = "../util", version = "2.1.0-beta.3" }
+grin_wallet_util = { path = "../util", version = "2.1.0-beta.4" }
 
 [dev-dependencies]
 pretty_assertions = "0.5.1"
diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_controller"
-version = "2.1.0-beta.3"
+version = "2.1.0-beta.4"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Controllers for grin wallet instantiation"
 license = "Apache-2.0"
@@ -32,9 +32,9 @@ chrono = { version = "0.4.4", features = ["serde"] }
 easy-jsonrpc-mw = "0.5.3"
 lazy_static = "1"
 
-grin_wallet_util = { path = "../util", version = "2.1.0-beta.3" }
+grin_wallet_util = { path = "../util", version = "2.1.0-beta.4" }
 
-grin_wallet_api = { path = "../api", version = "2.1.0-beta.3" }
-grin_wallet_impls = { path = "../impls", version = "2.1.0-beta.3" }
-grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.3" }
-grin_wallet_config = { path = "../config", version = "2.1.0-beta.3" }
+grin_wallet_api = { path = "../api", version = "2.1.0-beta.4" }
+grin_wallet_impls = { path = "../impls", version = "2.1.0-beta.4" }
+grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.4" }
+grin_wallet_config = { path = "../config", version = "2.1.0-beta.4" }
diff --git a/impls/Cargo.toml b/impls/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_impls"
-version = "2.1.0-beta.3"
+version = "2.1.0-beta.4"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Concrete types derived from libwallet traits"
 license = "Apache-2.0"
@@ -26,8 +26,7 @@ tokio-core = "0.1"
 tokio-retry = "0.1"
 uuid = { version = "0.7", features = ["serde", "v4"] }
 chrono = { version = "0.4.4", features = ["serde"] }
-url = "1.7.2"
 
-grin_wallet_util = { path = "../util", version = "2.1.0-beta.3" }
-grin_wallet_config = { path = "../config", version = "2.1.0-beta.3" }
-grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.3" }
+grin_wallet_util = { path = "../util", version = "2.1.0-beta.4" }
+grin_wallet_config = { path = "../config", version = "2.1.0-beta.4" }
+grin_wallet_libwallet = { path = "../libwallet", version = "2.1.0-beta.4" }
diff --git a/impls/src/adapters/http.rs b/impls/src/adapters/http.rs
@@ -18,25 +18,26 @@ use crate::libwallet::{Error, ErrorKind, Slate};
 use crate::SlateSender;
 use serde::Serialize;
 use serde_json::{json, Value};
-use url::Url;
 
 #[derive(Clone)]
 pub struct HttpSlateSender {
-	base_url: Url,
+	base_url: String,
 }
 
 impl HttpSlateSender {
 	/// Create, return Err if scheme is not "http"
-	pub fn new(base_url: Url) -> Result<HttpSlateSender, SchemeNotHttp> {
-		if base_url.scheme() != "http" && base_url.scheme() != "https" {
+	pub fn new(base_url: &str) -> Result<HttpSlateSender, SchemeNotHttp> {
+		if !base_url.starts_with("http") && !base_url.starts_with("https") {
 			Err(SchemeNotHttp)
 		} else {
-			Ok(HttpSlateSender { base_url })
+			Ok(HttpSlateSender {
+				base_url: base_url.to_owned(),
+			})
 		}
 	}
 
 	/// Check version of the listening wallet
-	fn check_other_version(&self, url: &Url) -> Result<(), Error> {
+	fn check_other_version(&self, url: &str) -> Result<(), Error> {
 		let req = json!({
 			"jsonrpc": "2.0",
 			"method": "check_version",
@@ -95,13 +96,15 @@ impl HttpSlateSender {
 
 impl SlateSender for HttpSlateSender {
 	fn send_tx(&self, slate: &Slate) -> Result<Slate, Error> {
-		let url: Url = self
-			.base_url
-			.join("/v2/foreign")
-			.expect("/v2/foreign is an invalid url path");
-		debug!("Posting transaction slate to {}", url);
+		let trailing = match self.base_url.ends_with('/') {
+			true => "",
+			false => "/",
+		};
+		let url_str = format!("{}{}v2/foreign", self.base_url, trailing);
 
-		self.check_other_version(&url)?;
+		debug!("Posting transaction slate to {}", url_str);
+
+		self.check_other_version(&url_str)?;
 
 		// Note: not using easy-jsonrpc as don't want the dependencies in this crate
 		let req = json!({
@@ -116,7 +119,7 @@ impl SlateSender for HttpSlateSender {
 		});
 		trace!("Sending receive_tx request: {}", req);
 
-		let res: String = post(&url, None, &req).map_err(|e| {
+		let res: String = post(&url_str, None, &req).map_err(|e| {
 			let report = format!("Posting transaction slate (is recipient listening?): {}", e);
 			error!("{}", report);
 			ErrorKind::ClientCallback(report)
@@ -152,12 +155,12 @@ impl Into<Error> for SchemeNotHttp {
 	}
 }
 
-pub fn post<IN>(url: &Url, api_secret: Option<String>, input: &IN) -> Result<String, api::Error>
+pub fn post<IN>(url: &str, api_secret: Option<String>, input: &IN) -> Result<String, api::Error>
 where
 	IN: Serialize,
 {
 	// TODO: change create_post_request to accept a url instead of a &str
-	let req = api::client::create_post_request(url.as_str(), api_secret, input)?;
+	let req = api::client::create_post_request(url, api_secret, input)?;
 	let res = api::client::send_request(req)?;
 	Ok(res)
 }
diff --git a/impls/src/adapters/mod.rs b/impls/src/adapters/mod.rs
@@ -58,19 +58,14 @@ pub trait SlateGetter {
 
 /// select a SlateSender based on method and dest fields from, e.g., SendArgs
 pub fn create_sender(method: &str, dest: &str) -> Result<Box<dyn SlateSender>, Error> {
-	use url::Url;
-
 	let invalid = || {
 		ErrorKind::WalletComms(format!(
 			"Invalid wallet comm type and destination. method: {}, dest: {}",
 			method, dest
 		))
 	};
 	Ok(match method {
-		"http" => {
-			let url: Url = dest.parse().map_err(|_| invalid())?;
-			Box::new(HttpSlateSender::new(url).map_err(|_| invalid())?)
-		}
+		"http" => Box::new(HttpSlateSender::new(dest).map_err(|_| invalid())?),
 		"keybase" => Box::new(KeybaseChannel::new(dest.to_owned())?),
 		"self" => {
 			return Err(ErrorKind::WalletComms(

diff --git a/libwallet/Cargo.toml b/libwallet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_libwallet"
-version = "2.1.0-beta.3"
+version = "2.1.0-beta.4"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
 license = "Apache-2.0"
@@ -25,5 +25,5 @@ lazy_static = "1"
 strum = "0.15"
 strum_macros = "0.15"
 
-grin_wallet_util = { path = "../util", version = "2.1.0-beta.3" }
-grin_wallet_config = { path = "../config", version = "2.1.0-beta.3" }
+grin_wallet_util = { path = "../util", version = "2.1.0-beta.4" }
+grin_wallet_config = { path = "../config", version = "2.1.0-beta.4" }
diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_wallet_util"
-version = "2.1.0-beta.3"
+version = "2.1.0-beta.4"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Util, for generic utilities and to re-export grin crates"
 license = "Apache-2.0"