Skip to content
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

Jump to bottom

feat: remove wallet type from config #6357

Merged
merged 2 commits into from
May 28, 2024
Merged

feat: remove wallet type from config #6357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1006fb
Remove wallet type from config
hansieodendaal May 27, 2024
31be0f9
clippy
hansieodendaal May 28, 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
4 changes: 0 additions & 4 deletions applications/minotari_console_wallet/src/init/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,10 +831,6 @@ pub fn prompt_wallet_type(
return Some(WalletType::default());
}

if wallet_config.wallet_type.is_some() {
return wallet_config.wallet_type.clone();
}

match boot_mode {
WalletBoot::New => {
#[cfg(not(feature = "ledger"))]
Expand Down
5 changes: 1 addition & 4 deletions base_layer/wallet/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use tari_common::{
configuration::{serializers, Network, StringList},
SubConfigPath,
};
use tari_common_types::{grpc_authentication::GrpcAuthentication, wallet_types::WalletType};
use tari_common_types::grpc_authentication::GrpcAuthentication;
use tari_comms::multiaddr::Multiaddr;
use tari_p2p::P2pConfig;
use tari_utilities::SafePassword;
Expand Down Expand Up @@ -118,8 +118,6 @@ pub struct WalletConfig {
pub use_libtor: bool,
/// A path to the file that stores the base node identity and secret key
pub identity_file: Option<PathBuf>,
/// The type of wallet software, or specific type of hardware
pub wallet_type: Option<WalletType>,
/// The cool down period between balance enquiry checks in seconds; requests faster than this will be ignored.
/// For specialized wallets processing many batch transactions this setting could be increased to 60 s to retain
/// responsiveness of the wallet with slightly delayed balance updates
Expand Down Expand Up @@ -163,7 +161,6 @@ impl Default for WalletConfig {
num_required_confirmations: 3,
use_libtor: true,
identity_file: None,
wallet_type: None,
balance_enquiry_cooldown_period: Duration::from_secs(5),
}
}
Expand Down
Loading