From 0b07484bfdf9df9f1bbbd74bbe895df3e74f62bd Mon Sep 17 00:00:00 2001 From: Erdem Yerebasmaz Date: Mon, 29 Apr 2024 18:05:53 +0300 Subject: [PATCH] Rename init() to connect() --- lib/ls-sdk-bindings/src/lib.rs | 4 ++-- lib/ls-sdk-core/src/bindings.rs | 4 ++-- lib/ls-sdk-core/src/wallet.rs | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/ls-sdk-bindings/src/lib.rs b/lib/ls-sdk-bindings/src/lib.rs index 36d53d6..313d280 100644 --- a/lib/ls-sdk-bindings/src/lib.rs +++ b/lib/ls-sdk-bindings/src/lib.rs @@ -23,12 +23,12 @@ impl From for LsSdkError { } } -pub fn init( +pub fn connect( mnemonic: String, data_dir: Option, network: Network, ) -> Result, LsSdkError> { - let ln_sdk = Wallet::init(&mnemonic, data_dir, network)?; + let ln_sdk = Wallet::connect(&mnemonic, data_dir, network)?; Ok(Arc::from(BindingWallet { ln_sdk })) } diff --git a/lib/ls-sdk-core/src/bindings.rs b/lib/ls-sdk-core/src/bindings.rs index 6095d6c..9e33a9d 100644 --- a/lib/ls-sdk-core/src/bindings.rs +++ b/lib/ls-sdk-core/src/bindings.rs @@ -15,8 +15,8 @@ use super::model::Payment; static WALLET_INSTANCE: OnceLock> = OnceLock::new(); -pub fn init(mnemonic: String, data_dir: Option, network: Network) -> Result<()> { - let wallet = Wallet::init(&mnemonic, data_dir, network)?; +pub fn connect(mnemonic: String, data_dir: Option, network: Network) -> Result<()> { + let wallet = Wallet::connect(&mnemonic, data_dir, network)?; WALLET_INSTANCE.get_or_init(|| wallet); Ok(()) } diff --git a/lib/ls-sdk-core/src/wallet.rs b/lib/ls-sdk-core/src/wallet.rs index 5361b51..1d38e72 100644 --- a/lib/ls-sdk-core/src/wallet.rs +++ b/lib/ls-sdk-core/src/wallet.rs @@ -648,7 +648,8 @@ mod tests { #[test] fn normal_submarine_swap() -> Result<()> { let (_data_dir, data_dir_str) = create_temp_dir()?; - let breez_wallet = Wallet::connect(TEST_MNEMONIC, Some(data_dir_str), Network::LiquidTestnet)?; + let breez_wallet = + Wallet::connect(TEST_MNEMONIC, Some(data_dir_str), Network::LiquidTestnet)?; let invoice = "lntb10u1pnqwkjrpp5j8ucv9mgww0ajk95yfpvuq0gg5825s207clrzl5thvtuzfn68h0sdqqcqzzsxqr23srzjqv8clnrfs9keq3zlg589jvzpw87cqh6rjks0f9g2t9tvuvcqgcl45f6pqqqqqfcqqyqqqqlgqqqqqqgq2qsp5jnuprlxrargr6hgnnahl28nvutj3gkmxmmssu8ztfhmmey3gq2ss9qyyssq9ejvcp6frwklf73xvskzdcuhnnw8dmxag6v44pffwqrxznsly4nqedem3p3zhn6u4ln7k79vk6zv55jjljhnac4gnvr677fyhfgn07qp4x6wrq"; breez_wallet.prepare_send_payment(&invoice)?; @@ -660,7 +661,8 @@ mod tests { #[test] fn reverse_submarine_swap() -> Result<()> { let (_data_dir, data_dir_str) = create_temp_dir()?; - let breez_wallet = Wallet::connect(TEST_MNEMONIC, Some(data_dir_str), Network::LiquidTestnet)?; + let breez_wallet = + Wallet::connect(TEST_MNEMONIC, Some(data_dir_str), Network::LiquidTestnet)?; let prepare_response = breez_wallet.prepare_receive_payment(&PrepareReceiveRequest { receiver_amount_sat: Some(1000),