Fix clippy for beta toolchain (#4742)

* Fix clippy for beta toolchain

* Remove ignored default-features for workspace dependency

* Add nym- prefix to serde-helpers crate

* Remove unused local_guard mod
This commit is contained in:
Jon Häggblad
2024-08-02 11:05:34 +02:00
committed by GitHub
parent 1dcb0a0456
commit 996ce6a233
6 changed files with 16 additions and 59 deletions
Generated
+10 -10
View File
@@ -4294,10 +4294,10 @@ dependencies = [
"nym-ecash-time",
"nym-mixnet-contract-common",
"nym-node-requests",
"nym-serde-helpers",
"rocket",
"schemars",
"serde",
"serde-helpers",
"serde_json",
"sha2 0.10.8",
"tendermint 0.37.0",
@@ -5709,6 +5709,15 @@ dependencies = [
"zeroize",
]
[[package]]
name = "nym-serde-helpers"
version = "0.1.0"
dependencies = [
"base64 0.21.7",
"bs58 0.5.1",
"serde",
]
[[package]]
name = "nym-service-providers-common"
version = "0.1.0"
@@ -7954,15 +7963,6 @@ dependencies = [
"serde_derive",
]
[[package]]
name = "serde-helpers"
version = "0.1.0"
dependencies = [
"base64 0.21.7",
"bs58 0.5.1",
"serde",
]
[[package]]
name = "serde-json-wasm"
version = "0.5.0"
+2 -2
View File
@@ -1,5 +1,5 @@
[package]
name = "serde-helpers"
name = "nym-serde-helpers"
version = "0.1.0"
authors.workspace = true
repository.workspace = true
@@ -12,7 +12,7 @@ license.workspace = true
[dependencies]
serde = { workspace = true, default-features = false }
serde = { workspace = true }
bs58 = { workspace = true, optional = true }
base64 = { workspace = true, optional = true }
+1 -1
View File
@@ -24,7 +24,7 @@ sha2 = "0.10.8"
# for serde on secp256k1 signatures
ecdsa = { workspace = true, features = ["serde"] }
serde-helpers = { path = "../../common/serde-helpers", features = ["bs58", "base64"] }
nym-serde-helpers = { path = "../../common/serde-helpers", features = ["bs58", "base64"] }
nym-credentials-interface = { path = "../../common/credentials-interface" }
nym-crypto = { path = "../../common/crypto", features = ["serde", "asymmetric"] }
+3 -3
View File
@@ -283,7 +283,7 @@ pub struct CredentialsRequestBody {
#[derive(Clone, Serialize, Deserialize, Debug, JsonSchema, PartialEq)]
pub struct SerialNumberWrapper(
#[serde(with = "serde_helpers::bs58")]
#[serde(with = "nym_serde_helpers::bs58")]
#[schemars(with = "String")]
Vec<u8>,
);
@@ -309,7 +309,7 @@ impl From<Vec<u8>> for SerialNumberWrapper {
#[derive(Clone, Serialize, Deserialize, Debug, JsonSchema, PartialEq)]
pub struct BatchRedeemTicketsBody {
#[serde(with = "serde_helpers::bs58")]
#[serde(with = "nym_serde_helpers::bs58")]
#[schemars(with = "String")]
pub digest: Vec<u8>,
pub included_serial_numbers: Vec<SerialNumberWrapper>,
@@ -358,7 +358,7 @@ pub struct EcashBatchTicketRedemptionResponse {
#[derive(Clone, Serialize, Deserialize, Debug, JsonSchema)]
#[serde(rename_all = "camelCase")]
pub struct SpentCredentialsResponse {
#[serde(with = "serde_helpers::base64")]
#[serde(with = "nym_serde_helpers::base64")]
#[schemars(with = "String")]
pub bitmap: Vec<u8>,
}
@@ -1,42 +0,0 @@
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
// SPDX-License-Identifier: GPL-3.0-only
use rocket::http::Status;
use rocket::request::{FromRequest, Outcome};
use rocket::Request;
use std::fmt::Debug;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
#[derive(Debug)]
pub struct NonLocalRequestError;
/// Request guard that only allows requests coming from a local address
pub(crate) struct LocalRequest;
fn is_local_address(ip: Option<IpAddr>) -> bool {
if let Some(address) = ip {
match address {
IpAddr::V4(ip) => ip == Ipv4Addr::LOCALHOST,
IpAddr::V6(ip) => ip == Ipv6Addr::LOCALHOST,
}
} else {
false
}
}
#[rocket::async_trait]
impl<'r> FromRequest<'r> for LocalRequest {
type Error = NonLocalRequestError;
async fn from_request(request: &'r Request<'_>) -> Outcome<Self, Self::Error> {
if is_local_address(request.client_ip()) {
Outcome::Success(LocalRequest)
} else {
warn!(
"Received a request from {:?} for a local-only route",
request.client_ip()
);
Outcome::Error((Status::Unauthorized, NonLocalRequestError))
}
}
}
-1
View File
@@ -16,7 +16,6 @@ use std::time::Duration;
pub(crate) mod cache;
pub(crate) mod helpers;
pub(crate) mod local_guard;
pub(crate) mod models;
pub(crate) mod reward_estimate;
pub(crate) mod routes;