From b42e95d2b141aa911830cebcd50e67daa5816c9b Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Wed, 25 Jun 2025 20:05:58 +0100 Subject: [PATCH] chore: remove dead code --- crates/cdk-lnd/src/proto/mod.rs | 1 + crates/cdk-signatory/src/proto/convert.rs | 69 +------------------ .../cdk-signatory/src/proto/signatory.proto | 32 --------- crates/cdk/src/oidc_client.rs | 9 --- 4 files changed, 2 insertions(+), 109 deletions(-) diff --git a/crates/cdk-lnd/src/proto/mod.rs b/crates/cdk-lnd/src/proto/mod.rs index b7d39db7..2a887518 100644 --- a/crates/cdk-lnd/src/proto/mod.rs +++ b/crates/cdk-lnd/src/proto/mod.rs @@ -1,4 +1,5 @@ #[allow(clippy::all, clippy::pedantic, clippy::restriction, clippy::nursery)] +#[allow(dead_code)] pub(crate) mod lnrpc { tonic::include_proto!("lnrpc"); } diff --git a/crates/cdk-signatory/src/proto/convert.rs b/crates/cdk-signatory/src/proto/convert.rs index 64aa1809..0bb11c03 100644 --- a/crates/cdk-signatory/src/proto/convert.rs +++ b/crates/cdk-signatory/src/proto/convert.rs @@ -3,7 +3,7 @@ use std::collections::BTreeMap; use cdk_common::secret::Secret; use cdk_common::util::hex; -use cdk_common::{Amount, HTLCWitness, P2PKWitness, PublicKey}; +use cdk_common::{Amount, PublicKey}; use tonic::Status; use super::*; @@ -192,31 +192,6 @@ impl TryInto for Proof { } } -impl From for ProofDleq { - fn from(value: cdk_common::ProofDleq) -> Self { - ProofDleq { - e: value.e.as_secret_bytes().to_vec(), - s: value.s.as_secret_bytes().to_vec(), - r: value.r.as_secret_bytes().to_vec(), - } - } -} - -impl TryInto for ProofDleq { - type Error = Status; - - fn try_into(self) -> Result { - Ok(cdk_common::ProofDleq { - e: cdk_common::SecretKey::from_slice(&self.e) - .map_err(|e| Status::from_error(Box::new(e)))?, - s: cdk_common::SecretKey::from_slice(&self.s) - .map_err(|e| Status::from_error(Box::new(e)))?, - r: cdk_common::SecretKey::from_slice(&self.r) - .map_err(|e| Status::from_error(Box::new(e)))?, - }) - } -} - impl TryInto for BlindSignature { type Error = cdk_common::error::Error; @@ -256,48 +231,6 @@ impl TryInto for BlindedMessage { } } -impl From for Witness { - fn from(value: cdk_common::Witness) -> Self { - match value { - cdk_common::Witness::P2PKWitness(P2PKWitness { signatures }) => Witness { - witness_type: Some(witness::WitnessType::P2pkWitness(P2pkWitness { - signatures, - })), - }, - cdk_common::Witness::HTLCWitness(HTLCWitness { - preimage, - signatures, - }) => Witness { - witness_type: Some(witness::WitnessType::HtlcWitness(HtlcWitness { - preimage, - signatures: signatures.unwrap_or_default(), - })), - }, - } - } -} - -impl TryInto for Witness { - type Error = Status; - fn try_into(self) -> Result { - match self.witness_type { - Some(witness::WitnessType::P2pkWitness(P2pkWitness { signatures })) => { - Ok(P2PKWitness { signatures }.into()) - } - Some(witness::WitnessType::HtlcWitness(hltc_witness)) => Ok(HTLCWitness { - preimage: hltc_witness.preimage, - signatures: if hltc_witness.signatures.is_empty() { - None - } else { - Some(hltc_witness.signatures) - }, - } - .into()), - None => Err(Status::invalid_argument("Witness type not set")), - } - } -} - impl From<()> for EmptyRequest { fn from(_: ()) -> Self { EmptyRequest {} diff --git a/crates/cdk-signatory/src/proto/signatory.proto b/crates/cdk-signatory/src/proto/signatory.proto index 7ef6aee5..8cb91211 100644 --- a/crates/cdk-signatory/src/proto/signatory.proto +++ b/crates/cdk-signatory/src/proto/signatory.proto @@ -104,16 +104,6 @@ message Proof { bytes c = 4; } -message ProofDLEQ { - bytes e = 1; - bytes s = 2; - bytes r = 3; -} - -message SigningResponse { - Error error = 1; - BlindSignatures blind_signatures = 2; -} message BlindSignatures { repeated BlindSignature blind_signatures = 1; } @@ -130,28 +120,6 @@ message BlindSignatureDLEQ { bytes s = 2; } -// Witness type -message Witness { - oneof witness_type { - P2PKWitness p2pk_witness = 1; - HTLCWitness htlc_witness = 2; - } -} - -// P2PKWitness type -message P2PKWitness { - // List of signatures - repeated string signatures = 1; -} - -// HTLCWitness type -message HTLCWitness { - // Preimage - string preimage = 1; - // List of signatures - repeated string signatures = 2; -} - enum ErrorCode { ERROR_CODE_UNSPECIFIED = 0; ERROR_CODE_AMOUNT_OUTSIDE_LIMIT = 1; diff --git a/crates/cdk/src/oidc_client.rs b/crates/cdk/src/oidc_client.rs index 2f742d49..a01f2368 100644 --- a/crates/cdk/src/oidc_client.rs +++ b/crates/cdk/src/oidc_client.rs @@ -69,15 +69,6 @@ pub enum GrantType { RefreshToken, } -#[cfg(feature = "wallet")] -#[derive(Debug, Clone, Serialize)] -pub struct AccessTokenRequest { - pub grant_type: GrantType, - pub client_id: String, - pub username: String, - pub password: String, -} - #[cfg(feature = "wallet")] #[derive(Debug, Clone, Serialize)] pub struct RefreshTokenRequest {