From 89bf1e9422780ad1d5ed3ae28d907dd227036579 Mon Sep 17 00:00:00 2001 From: Pravdyvy Date: Wed, 27 May 2026 12:25:13 +0300 Subject: [PATCH] fix(wallet): merge postfix --- wallet/src/program_facades/amm.rs | 24 +++++++++---------- wallet/src/program_facades/ata.rs | 8 +++---- .../native_token_transfer/shielded.rs | 2 +- wallet/src/program_facades/token.rs | 16 ++++++------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/wallet/src/program_facades/amm.rs b/wallet/src/program_facades/amm.rs index 6c9a5261..9aa25661 100644 --- a/wallet/src/program_facades/amm.rs +++ b/wallet/src/program_facades/amm.rs @@ -3,7 +3,7 @@ use common::HashType; use nssa::{AccountId, program::Program}; use token_core::TokenHolding; -use crate::{AccountIdentity, ExecutionFailureKind, WalletCore}; +use crate::{AccountIdentity, ExecutionFailureKind, WalletCore, cli::CliAccountMention}; pub struct Amm<'wallet>(pub &'wallet WalletCore); impl Amm<'_> { @@ -15,9 +15,9 @@ impl Amm<'_> { user_holding_lp: AccountId, balance_a: u128, balance_b: u128, - a_mention: &CliAccountMention, - b_mention: &CliAccountMention, - lp_mention: &CliAccountMention, + _a_mention: &CliAccountMention, + _b_mention: &CliAccountMention, + _lp_mention: &CliAccountMention, ) -> Result { let program = Program::amm(); let amm_program_id = Program::amm().id(); @@ -77,8 +77,8 @@ impl Amm<'_> { swap_amount_in: u128, min_amount_out: u128, token_definition_id_in: AccountId, - a_mention: &CliAccountMention, - b_mention: &CliAccountMention, + _a_mention: &CliAccountMention, + _b_mention: &CliAccountMention, ) -> Result { let program = Program::amm(); let amm_program_id = Program::amm().id(); @@ -155,8 +155,8 @@ impl Amm<'_> { exact_amount_out: u128, max_amount_in: u128, token_definition_id_in: AccountId, - a_mention: &CliAccountMention, - b_mention: &CliAccountMention, + _a_mention: &CliAccountMention, + _b_mention: &CliAccountMention, ) -> Result { let program = Program::amm(); let amm_program_id = Program::amm().id(); @@ -234,9 +234,9 @@ impl Amm<'_> { min_amount_liquidity: u128, max_amount_to_add_token_a: u128, max_amount_to_add_token_b: u128, - a_mention: &CliAccountMention, - b_mention: &CliAccountMention, - lp_mention: &CliAccountMention, + _a_mention: &CliAccountMention, + _b_mention: &CliAccountMention, + _lp_mention: &CliAccountMention, ) -> Result { let program = Program::amm(); let amm_program_id = Program::amm().id(); @@ -297,7 +297,7 @@ impl Amm<'_> { remove_liquidity_amount: u128, min_amount_to_remove_token_a: u128, min_amount_to_remove_token_b: u128, - lp_mention: &CliAccountMention, + _lp_mention: &CliAccountMention, ) -> Result { let program = Program::amm(); let amm_program_id = Program::amm().id(); diff --git a/wallet/src/program_facades/ata.rs b/wallet/src/program_facades/ata.rs index 07bf10e3..9852935f 100644 --- a/wallet/src/program_facades/ata.rs +++ b/wallet/src/program_facades/ata.rs @@ -7,7 +7,7 @@ use nssa::{ }; use nssa_core::SharedSecretKey; -use crate::{AccountIdentity, ExecutionFailureKind, WalletCore}; +use crate::{AccountIdentity, ExecutionFailureKind, WalletCore, cli::CliAccountMention}; pub struct Ata<'wallet>(pub &'wallet WalletCore); @@ -16,7 +16,7 @@ impl Ata<'_> { &self, owner_id: AccountId, definition_id: AccountId, - owner_mention: &CliAccountMention, + _owner_mention: &CliAccountMention, ) -> Result { let program = Program::ata(); let ata_program_id = program.id(); @@ -47,7 +47,7 @@ impl Ata<'_> { definition_id: AccountId, recipient_id: AccountId, amount: u128, - owner_mention: &CliAccountMention, + _owner_mention: &CliAccountMention, ) -> Result { let program = Program::ata(); let ata_program_id = program.id(); @@ -80,7 +80,7 @@ impl Ata<'_> { owner_id: AccountId, definition_id: AccountId, amount: u128, - owner_mention: &CliAccountMention, + _owner_mention: &CliAccountMention, ) -> Result { let program = Program::ata(); let ata_program_id = program.id(); diff --git a/wallet/src/program_facades/native_token_transfer/shielded.rs b/wallet/src/program_facades/native_token_transfer/shielded.rs index 9e2e3a26..ffe02a30 100644 --- a/wallet/src/program_facades/native_token_transfer/shielded.rs +++ b/wallet/src/program_facades/native_token_transfer/shielded.rs @@ -3,7 +3,7 @@ use nssa::AccountId; use nssa_core::{Identifier, NullifierPublicKey, SharedSecretKey, encryption::ViewingPublicKey}; use super::{NativeTokenTransfer, auth_transfer_preparation}; -use crate::{AccountIdentity, ExecutionFailureKind}; +use crate::{AccountIdentity, ExecutionFailureKind, cli::CliAccountMention}; impl NativeTokenTransfer<'_> { pub async fn send_shielded_transfer( diff --git a/wallet/src/program_facades/token.rs b/wallet/src/program_facades/token.rs index 0ced8464..64cb2a2e 100644 --- a/wallet/src/program_facades/token.rs +++ b/wallet/src/program_facades/token.rs @@ -3,7 +3,7 @@ use nssa::{AccountId, program::Program}; use nssa_core::{Identifier, NullifierPublicKey, SharedSecretKey, encryption::ViewingPublicKey}; use token_core::Instruction; -use crate::{AccountIdentity, ExecutionFailureKind, WalletCore}; +use crate::{AccountIdentity, ExecutionFailureKind, WalletCore, cli::CliAccountMention}; pub struct Token<'wallet>(pub &'wallet WalletCore); @@ -14,8 +14,8 @@ impl Token<'_> { supply_account_id: AccountId, name: String, total_supply: u128, - definition_mention: &CliAccountMention, - supply_mention: &CliAccountMention, + _definition_mention: &CliAccountMention, + _supply_mention: &CliAccountMention, ) -> Result { let program = Program::token(); let instruction = Instruction::NewFungibleDefinition { name, total_supply }; @@ -139,8 +139,8 @@ impl Token<'_> { sender_account_id: AccountId, recipient_account_id: AccountId, amount: u128, - sender_mention: &CliAccountMention, - recipient_mention: &CliAccountMention, + _sender_mention: &CliAccountMention, + _recipient_mention: &CliAccountMention, ) -> Result { let program = Program::token(); let instruction = Instruction::Transfer { @@ -346,7 +346,7 @@ impl Token<'_> { definition_account_id: AccountId, holder_account_id: AccountId, amount: u128, - holder_mention: &CliAccountMention, + _holder_mention: &CliAccountMention, ) -> Result { let program = Program::token(); let instruction = Instruction::Burn { @@ -475,8 +475,8 @@ impl Token<'_> { definition_account_id: AccountId, holder_account_id: AccountId, amount: u128, - definition_mention: &CliAccountMention, - holder_mention: &CliAccountMention, + _definition_mention: &CliAccountMention, + _holder_mention: &CliAccountMention, ) -> Result { let program = Program::token(); let instruction = Instruction::Mint {