Core/grin-wallet
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin-wallet.git synced 2025-01-20 19:11:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes related to recent tokio changes (#640)

Browse source
This commit is contained in:
Yeastplume 2022-01-17 09:33:08 +00:00 committed by GitHub
parent 4c81e4a693
commit f5dbed2014
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
impls/src/client_utils/client.rs
View file

@ -319,9 +319,13 @@ impl Client {
if Handle::try_current().is_ok() { if Handle::try_current().is_ok() {
let rt = RUNTIME.clone(); let rt = RUNTIME.clone();
let client = self.clone(); let client = self.clone();
std::thread::spawn(move || rt.lock().unwrap().block_on(client.send_request_async(req))) std::thread::spawn(move || {
.join() rt.lock()
.unwrap() .unwrap()
.block_on(async { client.send_request_async(req).await })
})
.join()
.unwrap()
} else { } else {
RUNTIME RUNTIME
.lock() .lock()

9
impls/src/node_clients/http.rs
View file

@ -230,6 +230,7 @@ impl NodeClient for HTTPNodeClient {
let url = format!("{}{}", self.node_url(), ENDPOINT); let url = format!("{}{}", self.node_url(), ENDPOINT);
let api_secret = self.node_api_secret(); let api_secret = self.node_api_secret();
let cl = self.client.clone();
let task = async move { let task = async move {
let params: Vec<_> = query_params let params: Vec<_> = query_params
.chunks(chunk_size) .chunks(chunk_size)
@ -243,7 +244,7 @@ impl NodeClient for HTTPNodeClient {
let mut tasks = Vec::with_capacity(params.len()); let mut tasks = Vec::with_capacity(params.len());
for req in &reqs { for req in &reqs {
tasks.push(self.client.post_async::<Request, Response>( tasks.push(cl.post_async::<Request, Response>(
url.as_str(), url.as_str(),
req, req,
api_secret.clone(), api_secret.clone(),
@ -254,7 +255,11 @@ impl NodeClient for HTTPNodeClient {
task.try_collect().await task.try_collect().await
}; };
let res: Result<Vec<_>, _> = RUNTIME.lock().unwrap().block_on(task); let rt = RUNTIME.clone();
let res: Result<Vec<_>, _> =
std::thread::spawn(move || rt.lock().unwrap().block_on(async move { task.await }))
.join()
.unwrap();
let results: Vec<OutputPrintable> = match res { let results: Vec<OutputPrintable> = match res {
Ok(resps) => { Ok(resps) => {