From 0ac710ce752a2e9b2df0d1d5180fa15fdcfbb209 Mon Sep 17 00:00:00 2001
From: wood <wangwei276711392@163.com>
Date: Sun, 21 Sep 2025 02:56:02 +0800
Subject: [PATCH] fix build warn

---
 src/instruction/pumpswap.rs         | 36 ++++++++++-------------------
 src/trading/common/nonce_manager.rs |  2 +-
 src/trading/factory.rs              |  1 -
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/instruction/pumpswap.rs b/src/instruction/pumpswap.rs
index 7cd37c0..1d27cc2 100755
--- a/src/instruction/pumpswap.rs
+++ b/src/instruction/pumpswap.rs
@@ -68,9 +68,7 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
             creator = params_coin_creator_vault_authority;
         }
 
-        let mut token_amount = 0;
-        let mut sol_amount = 0;
-        if quote_mint_is_wsol {
+        let (token_amount, sol_amount) = if quote_mint_is_wsol {
             let result = buy_quote_input_internal(
                 params.sol_amount,
                 params.slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE),
@@ -79,10 +77,8 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
                 &creator,
             )
             .unwrap();
-            // base_amount_out
-            token_amount = result.base;
-            // max_quote_amount_in
-            sol_amount = result.max_quote;
+            // base_amount_out, max_quote_amount_in
+            (result.base, result.max_quote)
         } else {
             let result = sell_base_input_internal(
                 params.sol_amount,
@@ -92,11 +88,9 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
                 &creator,
             )
             .unwrap();
-            // min_quote_amount_out
-            token_amount = result.min_quote;
-            // base_amount_in
-            sol_amount = params.sol_amount;
-        }
+            // min_quote_amount_out, base_amount_in
+            (result.min_quote, params.sol_amount)
+        };
 
         let user_base_token_account =
             crate::common::fast_fn::get_associated_token_address_with_program_id_fast_use_seed(
@@ -239,9 +233,7 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
             creator = params_coin_creator_vault_authority;
         }
 
-        let mut token_amount = 0;
-        let mut sol_amount = 0;
-        if quote_mint_is_wsol {
+        let (token_amount, sol_amount) = if quote_mint_is_wsol {
             let result = sell_base_input_internal(
                 params.token_amount.unwrap(),
                 params.slippage_basis_points.unwrap_or(DEFAULT_SLIPPAGE),
@@ -250,10 +242,8 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
                 &creator,
             )
             .unwrap();
-            // base_amount_in
-            token_amount = params.token_amount.unwrap();
-            // min_quote_amount_out
-            sol_amount = result.min_quote;
+            // base_amount_in, min_quote_amount_out
+            (params.token_amount.unwrap(), result.min_quote)
         } else {
             let result = buy_quote_input_internal(
                 params.token_amount.unwrap(),
@@ -263,11 +253,9 @@ impl InstructionBuilder for PumpSwapInstructionBuilder {
                 &creator,
             )
             .unwrap();
-            // max_quote_amount_in
-            token_amount = result.max_quote;
-            // base_amount_out
-            sol_amount = result.base;
-        }
+            // max_quote_amount_in, base_amount_out
+            (result.max_quote, result.base)
+        };
 
         let fee_recipient_ata = fee_recipient_ata(accounts::FEE_RECIPIENT, quote_mint);
         let user_base_token_account =
diff --git a/src/trading/common/nonce_manager.rs b/src/trading/common/nonce_manager.rs
index 79ba286..299150f 100755
--- a/src/trading/common/nonce_manager.rs
+++ b/src/trading/common/nonce_manager.rs
@@ -1,5 +1,5 @@
 use solana_hash::Hash;
-use solana_sdk::{instruction::Instruction, pubkey::Pubkey, signature::Keypair, signer::Signer};
+use solana_sdk::{instruction::Instruction, signature::Keypair, signer::Signer};
 use solana_system_interface::instruction::advance_nonce_account;
 
 use crate::common::nonce_cache::DurableNonceInfo;
diff --git a/src/trading/factory.rs b/src/trading/factory.rs
index 0d5b06b..fa6bfb1 100755
--- a/src/trading/factory.rs
+++ b/src/trading/factory.rs
@@ -1,4 +1,3 @@
-use anyhow::{anyhow, Result};
 use std::sync::Arc;
 
 use crate::instruction::{