Merge pull request jl777#595 from KomodoPlatform/mm2-gstuff

Add access to ISATTY for build script
DeckerSU · Mar 4, 2020 · 798b5a1 · 798b5a1
2 parents 475bd46 + 922a8ed
commit 798b5a1
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mm2src/coins/utxo/rpc_clients.rs b/mm2src/coins/utxo/rpc_clients.rs
@@ -688,9 +688,6 @@ pub fn spawn_electrum (req: &ElectrumRpcRequest) -> Result<ElectrumConnection, S
     if rc < 0 {panic! ("!host_electrum_connect: {}", rc)}
     let ri = rc;  // Random ID assigned by the host to connection.
 
-    // TODO: Import the `addr` from the host?
-    let addr = SocketAddr::new (IpAddr::V4 (Ipv4Addr::new (0, 0, 0, 0)), 0);
-
     let responses = Arc::new (Mutex::new (HashMap::new()));
     let tx = Arc::new (AsyncMutex::new (None));
 
@@ -705,7 +702,7 @@ pub fn spawn_electrum (req: &ElectrumRpcRequest) -> Result<ElectrumConnection, S
     }   }   };
 
     Ok (ElectrumConnection {
-        addr,
+        addr: req.url.clone(),
         config,
         tx,
         shutdown_tx: None,

diff --git a/mm2src/common/Cargo.toml b/mm2src/common/Cargo.toml
@@ -79,7 +79,7 @@ fomat-macros = "0.3"
 futures01 = { version = "0.1", package = "futures" }
 futures-cpupool = "0.1"
 glob = "0.3"
-gstuff = { version = "0.6", features = ["nightly"] }
+gstuff = { version = "0.6", features = ["nightly", "term"] }
 hyper = "0.12"
 hyper-rustls = "0.16"
 itertools = "0.8"