pyrite/torn-api.rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed executor typings

Browse source
This commit is contained in:
TotallyNot 2023-02-27 00:14:37 +01:00
parent 6e76f74fd3
commit 9109720d15
7 changed files with 106 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
torn-key-pool/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "torn-key-pool"
version = "0.5.5"
version = "0.5.6"
edition = "2021"
authors = ["Pyrit [2111649]"]
license = "MIT"
@ -17,7 +17,7 @@ tokio-runtime = [ "dep:tokio", "dep:rand" ]
actix-runtime = [ "dep:actix-rt", "dep:rand" ]
[dependencies]
torn-api = { path = "../torn-api", default-features = false, version = "0.5.5" }
torn-api = { path = "../torn-api", default-features = false, version = "0.5.10" }
async-trait = "0.1"
thiserror = "1"

14
torn-key-pool/src/local.rs
View file

@ -4,7 +4,7 @@ use async_trait::async_trait;
use torn_api::{
local::{ApiClient, ApiProvider, RequestExecutor},
ApiCategoryResponse, ApiRequest, ApiResponse, ResponseError,
ApiRequest, ApiResponse, ApiSelection, ResponseError,
};
use crate::{ApiKey, KeyPoolError, KeyPoolExecutor, KeyPoolStorage};
@ -22,9 +22,9 @@ where
client: &C,
mut request: ApiRequest<A>,
id: Option<String>,
) -> Result<A, Self::Error>
) -> Result<ApiResponse, Self::Error>
where
A: ApiCategoryResponse,
A: ApiSelection,
{
request.comment = self.comment.map(ToOwned::to_owned);
loop {
@ -49,7 +49,7 @@ where
}
}
Err(parsing_error) => return Err(KeyPoolError::Response(parsing_error)),
Ok(res) => return Ok(A::from_response(res)),
Ok(res) => return Ok(res),
};
}
}
@ -59,9 +59,9 @@ where
client: &C,
mut request: ApiRequest<A>,
ids: Vec<I>,
) -> HashMap<I, Result<A, Self::Error>>
) -> HashMap<I, Result<ApiResponse, Self::Error>>
where
A: ApiCategoryResponse,
A: ApiSelection,
I: ToString + std::hash::Hash + std::cmp::Eq,
{
let keys = match self
@ -111,7 +111,7 @@ where
Err(parsing_error) => {
return (id, Err(KeyPoolError::Response(parsing_error)))
}
Ok(res) => return (id, Ok(A::from_response(res))),
Ok(res) => return (id, Ok(res)),
};
key = match self.storage.acquire_key(self.domain.clone()).await {

14
torn-key-pool/src/send.rs
View file

@ -4,7 +4,7 @@ use async_trait::async_trait;
use torn_api::{
send::{ApiClient, ApiProvider, RequestExecutor},
ApiCategoryResponse, ApiRequest, ApiResponse, ResponseError,
ApiRequest, ApiResponse, ApiSelection, ResponseError,
};
use crate::{ApiKey, KeyPoolError, KeyPoolExecutor, KeyPoolStorage};
@ -22,9 +22,9 @@ where
client: &C,
mut request: ApiRequest<A>,
id: Option<String>,
) -> Result<A, Self::Error>
) -> Result<ApiResponse, Self::Error>
where
A: ApiCategoryResponse,
A: ApiSelection,
{
request.comment = self.comment.map(ToOwned::to_owned);
loop {
@ -49,7 +49,7 @@ where
}
}
Err(parsing_error) => return Err(KeyPoolError::Response(parsing_error)),
Ok(res) => return Ok(A::from_response(res)),
Ok(res) => return Ok(res),
};
}
}
@ -59,9 +59,9 @@ where
client: &C,
mut request: ApiRequest<A>,
ids: Vec<I>,
) -> HashMap<I, Result<A, Self::Error>>
) -> HashMap<I, Result<ApiResponse, Self::Error>>
where
A: ApiCategoryResponse,
A: ApiSelection,
I: ToString + std::hash::Hash + std::cmp::Eq + Send + Sync,
{
let keys = match self
@ -111,7 +111,7 @@ where
Err(parsing_error) => {
return (id, Err(KeyPoolError::Response(parsing_error)))
}
Ok(res) => return (id, Ok(A::from_response(res))),
Ok(res) => return (id, Ok(res)),
};
key = match self.storage.acquire_key(self.domain.clone()).await {