Skip to content

Fix clippy for beta toolchain #4742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
octol merged 4 commits into from
Aug 2, 2024
Merged

Fix clippy for beta toolchain #4742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9ce764
Fix clippy for beta toolchain
octol Aug 1, 2024
96cb268
Remove ignored default-features for workspace dependency
octol Aug 1, 2024
8210698
Add nym- prefix to serde-helpers crate
octol Aug 1, 2024
14ae993
Remove unused local_guard mod
octol Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions common/serde-helpers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "serde-helpers"
name = "nym-serde-helpers"
version = "0.1.0"
authors.workspace = true
repository.workspace = true
Expand All @@ -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 }

Expand Down
2 changes: 1 addition & 1 deletion nym-api/nym-api-requests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

Expand Down
6 changes: 3 additions & 3 deletions nym-api/nym-api-requests/src/ecash/models.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
);
Expand All @@ -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>,
Expand Down Expand Up @@ -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>,
}
Expand Down
42 changes: 0 additions & 42 deletions nym-api/src/node_status_api/local_guard.rs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion nym-api/src/node_status_api/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down