From 18d577aa4928434bfcf4d3d290c8781d826c0ea1 Mon Sep 17 00:00:00 2001 From: thesn10 <38666407+thesn10@users.noreply.github.com> Date: Tue, 19 May 2026 10:28:26 +0200 Subject: [PATCH] fix warnings --- programs/descro/src/instructions.rs | 2 ++ programs/descro/src/lib.rs | 2 ++ programs/descro/tests/common/mod.rs | 11 ++++++++--- programs/descro_ext_resolvers/src/instructions.rs | 2 ++ programs/descro_ext_resolvers/src/lib.rs | 15 ++++++++++++--- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/programs/descro/src/instructions.rs b/programs/descro/src/instructions.rs index b1a7831..d4b2e07 100644 --- a/programs/descro/src/instructions.rs +++ b/programs/descro/src/instructions.rs @@ -1,3 +1,5 @@ +#![allow(ambiguous_glob_reexports)] + pub mod cancel; pub mod complete; pub mod create_escrow; diff --git a/programs/descro/src/lib.rs b/programs/descro/src/lib.rs index 8b59419..55b6a84 100644 --- a/programs/descro/src/lib.rs +++ b/programs/descro/src/lib.rs @@ -1,3 +1,5 @@ +#![allow(clippy::diverging_sub_expression)] + pub mod constants; pub mod error; pub mod instructions; diff --git a/programs/descro/tests/common/mod.rs b/programs/descro/tests/common/mod.rs index 1563e16..3f69018 100644 --- a/programs/descro/tests/common/mod.rs +++ b/programs/descro/tests/common/mod.rs @@ -1,3 +1,5 @@ +pub use anchor_lang::prelude::Pubkey; +pub use descro::{EscrowState, Winner as EscrowWinner}; use { anchor_lang::{ solana_program::{instruction::Instruction, system_program}, @@ -10,8 +12,6 @@ use { solana_signer::Signer, solana_transaction::versioned::VersionedTransaction, }; -pub use anchor_lang::prelude::Pubkey; -pub use descro::{EscrowState, Winner as EscrowWinner}; pub const AMOUNT: u64 = 1_000_000_000; pub const ESCROW_ID: u64 = 1; @@ -82,7 +82,12 @@ pub fn ix_create_escrow( let vault = vault_pda(&escrow); Instruction::new_with_bytes( descro::id(), - &descro::instruction::CreateEscrow { amount, dispute_resolver, escrow_id }.data(), + &descro::instruction::CreateEscrow { + amount, + dispute_resolver, + escrow_id, + } + .data(), descro::accounts::CreateEscrow { seller: *seller, buyer: *buyer, diff --git a/programs/descro_ext_resolvers/src/instructions.rs b/programs/descro_ext_resolvers/src/instructions.rs index 8d57052..9217e24 100644 --- a/programs/descro_ext_resolvers/src/instructions.rs +++ b/programs/descro_ext_resolvers/src/instructions.rs @@ -1,3 +1,5 @@ +#![allow(ambiguous_glob_reexports)] + pub mod register; pub mod update; pub mod update_stats; diff --git a/programs/descro_ext_resolvers/src/lib.rs b/programs/descro_ext_resolvers/src/lib.rs index 42727e6..1369f16 100644 --- a/programs/descro_ext_resolvers/src/lib.rs +++ b/programs/descro_ext_resolvers/src/lib.rs @@ -1,3 +1,5 @@ +#![allow(clippy::diverging_sub_expression)] + pub mod error; pub mod instructions; pub mod state; @@ -12,8 +14,7 @@ pub use state::*; declare_id!("GwUPAKs3HHzCpj8uhet4NAnxk9GWNwfrYbpihu5DyFp"); /// Escrow Program ID — only its PDA may call update_stats. -pub const ESCROW_PROGRAM_ID: Pubkey = - pubkey!("DjVR4EuYV6USMJFfsGZwhZ3y8rtWsmG8EvDY96GTqqi3"); +pub const ESCROW_PROGRAM_ID: Pubkey = pubkey!("DjVR4EuYV6USMJFfsGZwhZ3y8rtWsmG8EvDY96GTqqi3"); #[program] pub mod descro_ext_resolvers { @@ -28,7 +29,15 @@ pub mod descro_ext_resolvers { fee_recipient: Pubkey, metadata_uri: String, ) -> Result<()> { - register::handler(ctx, resolver_type, name, description, fee_bps, fee_recipient, metadata_uri) + register::handler( + ctx, + resolver_type, + name, + description, + fee_bps, + fee_recipient, + metadata_uri, + ) } pub fn update_resolver(