mirror of
https://github.com/jwinterm/mwixnet.git
synced 2026-10-24 17:28:32 +02:00
Revert "build: update grin libs and related dependencies at lock file, update HttpWallet, HttpGrinNode, MixClient code accordingly"
This reverts commit e2507a122f.
This commit is contained in:
+1
-2
@@ -6,7 +6,6 @@ use crate::{tor, DalekPublicKey};
|
||||
use grin_onion::onion::Onion;
|
||||
|
||||
use grin_api::client;
|
||||
use grin_api::client::TimeOut;
|
||||
use grin_api::json_rpc::build_request;
|
||||
use grin_core::ser;
|
||||
use grin_core::ser::ProtocolVersion;
|
||||
@@ -76,7 +75,7 @@ impl MixClientImpl {
|
||||
req.headers_mut().extend(headers.clone().into_iter());
|
||||
}
|
||||
|
||||
let res = client::send_request(req, TimeOut::default()).map_err(ClientError::API)?;
|
||||
let res = client::send_request(req).map_err(ClientError::API)?;
|
||||
|
||||
serde_json::from_str(&res).map_err(ClientError::ResponseParse)
|
||||
}
|
||||
|
||||
+2
-6
@@ -114,12 +114,8 @@ impl HttpGrinNode {
|
||||
let url = format!("http://{}{}", self.node_url, ENDPOINT);
|
||||
let req = build_request(method, params);
|
||||
let res =
|
||||
client::post::<Request, Response>(
|
||||
url.as_str(),
|
||||
self.node_api_secret.clone(),
|
||||
&req,
|
||||
client::TimeOut::default()
|
||||
).map_err(NodeError::ApiCommError)?;
|
||||
client::post::<Request, Response>(url.as_str(), self.node_api_secret.clone(), &req)
|
||||
.map_err(NodeError::ApiCommError)?;
|
||||
let parsed = res
|
||||
.clone()
|
||||
.into_result()
|
||||
|
||||
+2
-7
@@ -133,7 +133,6 @@ impl HttpWallet {
|
||||
url.as_str(),
|
||||
wallet_owner_secret.clone(),
|
||||
&enc_req,
|
||||
client::TimeOut::default(),
|
||||
)
|
||||
.map_err(WalletError::ApiCommError)?;
|
||||
let decrypted = res
|
||||
@@ -155,12 +154,8 @@ impl HttpWallet {
|
||||
let url = format!("http://{}{}", wallet_owner_url, ENDPOINT);
|
||||
let req = build_request(method, params);
|
||||
let res =
|
||||
client::post::<Request, Response>(
|
||||
url.as_str(),
|
||||
wallet_owner_secret.clone(),
|
||||
&req,
|
||||
client::TimeOut::default()
|
||||
).map_err(WalletError::ApiCommError)?;
|
||||
client::post::<Request, Response>(url.as_str(), wallet_owner_secret.clone(), &req)
|
||||
.map_err(WalletError::ApiCommError)?;
|
||||
let parsed = res
|
||||
.clone()
|
||||
.into_result()
|
||||
|
||||
Reference in New Issue
Block a user