From fb13b8fc05f25392ce58ee639820855861bdd7ea Mon Sep 17 00:00:00 2001 From: Ross Savage Date: Wed, 3 Jul 2024 17:45:22 +0200 Subject: [PATCH] Rename to claim_reverse_swap --- libs/sdk-bindings/src/breez_sdk.udl | 2 +- libs/sdk-bindings/src/uniffi_binding.rs | 4 +-- libs/sdk-core/src/binding.rs | 6 ++-- libs/sdk-core/src/breez_services.rs | 8 +++--- libs/sdk-core/src/bridge_generated.io.rs | 4 +-- libs/sdk-core/src/bridge_generated.rs | 6 ++-- libs/sdk-core/src/swap_out/reverseswap.rs | 8 +++--- .../ios/Classes/bridge_generated.h | 4 +-- libs/sdk-flutter/lib/breez_sdk.dart | 8 +++--- libs/sdk-flutter/lib/bridge_generated.dart | 28 +++++++++---------- .../main/java/com/breezsdk/BreezSDKModule.kt | 4 +-- libs/sdk-react-native/ios/RNBreezSDK.m | 2 +- libs/sdk-react-native/ios/RNBreezSDK.swift | 6 ++-- libs/sdk-react-native/src/index.ts | 4 +-- 14 files changed, 47 insertions(+), 47 deletions(-) diff --git a/libs/sdk-bindings/src/breez_sdk.udl b/libs/sdk-bindings/src/breez_sdk.udl index 902ff7f2d..bd6824169 100644 --- a/libs/sdk-bindings/src/breez_sdk.udl +++ b/libs/sdk-bindings/src/breez_sdk.udl @@ -942,7 +942,7 @@ interface BlockingBreezServices { sequence in_progress_reverse_swaps(); [Throws=SdkError] - void process_reverse_swap(string lockup_address); + void claim_reverse_swap(string lockup_address); [Throws=SdkError] MaxReverseSwapAmountResponse max_reverse_swap_amount(); diff --git a/libs/sdk-bindings/src/uniffi_binding.rs b/libs/sdk-bindings/src/uniffi_binding.rs index 1aff77d8a..7aada9bd0 100644 --- a/libs/sdk-bindings/src/uniffi_binding.rs +++ b/libs/sdk-bindings/src/uniffi_binding.rs @@ -332,8 +332,8 @@ impl BlockingBreezServices { rt().block_on(self.breez_services.in_progress_reverse_swaps()) } - pub fn process_reverse_swap(&self, lockup_address: String) -> SdkResult<()> { - rt().block_on(self.breez_services.process_reverse_swap(lockup_address)) + pub fn claim_reverse_swap(&self, lockup_address: String) -> SdkResult<()> { + rt().block_on(self.breez_services.claim_reverse_swap(lockup_address)) } pub fn max_reverse_swap_amount(&self) -> SdkResult { diff --git a/libs/sdk-core/src/binding.rs b/libs/sdk-core/src/binding.rs index d3f7ef28a..8cbc6faaa 100644 --- a/libs/sdk-core/src/binding.rs +++ b/libs/sdk-core/src/binding.rs @@ -705,12 +705,12 @@ pub fn in_progress_reverse_swaps() -> Result> { .map_err(anyhow::Error::new::) } -/// See [BreezServices::process_reverse_swap] -pub fn process_reverse_swap(lockup_address: String) -> Result<()> { +/// See [BreezServices::claim_reverse_swap] +pub fn claim_reverse_swap(lockup_address: String) -> Result<()> { block_on(async { get_breez_services() .await? - .process_reverse_swap(lockup_address) + .claim_reverse_swap(lockup_address) .await }) .map_err(anyhow::Error::new::) diff --git a/libs/sdk-core/src/breez_services.rs b/libs/sdk-core/src/breez_services.rs index c2f93d682..39a79866a 100644 --- a/libs/sdk-core/src/breez_services.rs +++ b/libs/sdk-core/src/breez_services.rs @@ -796,16 +796,16 @@ impl BreezServices { Ok(()) } - /// Processes an individual reverse swap. + /// Claims an individual reverse swap. /// /// To be used only in the context of mobile notifications, where the notification triggers - /// an individual reverse swap to be processed. + /// an individual reverse swap to be claimed. /// /// This is taken care of automatically in the context of typical SDK usage. - pub async fn process_reverse_swap(&self, lockup_address: String) -> SdkResult<()> { + pub async fn claim_reverse_swap(&self, lockup_address: String) -> SdkResult<()> { Ok(self .btc_send_swapper - .process_reverse_swap(lockup_address) + .claim_reverse_swap(lockup_address) .await?) } diff --git a/libs/sdk-core/src/bridge_generated.io.rs b/libs/sdk-core/src/bridge_generated.io.rs index bd7e10b1e..f2313d99c 100644 --- a/libs/sdk-core/src/bridge_generated.io.rs +++ b/libs/sdk-core/src/bridge_generated.io.rs @@ -282,8 +282,8 @@ pub extern "C" fn wire_in_progress_reverse_swaps(port_: i64) { } #[no_mangle] -pub extern "C" fn wire_process_reverse_swap(port_: i64, lockup_address: *mut wire_uint_8_list) { - wire_process_reverse_swap_impl(port_, lockup_address) +pub extern "C" fn wire_claim_reverse_swap(port_: i64, lockup_address: *mut wire_uint_8_list) { + wire_claim_reverse_swap_impl(port_, lockup_address) } #[no_mangle] diff --git a/libs/sdk-core/src/bridge_generated.rs b/libs/sdk-core/src/bridge_generated.rs index a34371552..d0ad5606f 100644 --- a/libs/sdk-core/src/bridge_generated.rs +++ b/libs/sdk-core/src/bridge_generated.rs @@ -785,19 +785,19 @@ fn wire_in_progress_reverse_swaps_impl(port_: MessagePort) { move || move |task_callback| in_progress_reverse_swaps(), ) } -fn wire_process_reverse_swap_impl( +fn wire_claim_reverse_swap_impl( port_: MessagePort, lockup_address: impl Wire2Api + UnwindSafe, ) { FLUTTER_RUST_BRIDGE_HANDLER.wrap::<_, _, _, (), _>( WrapInfo { - debug_name: "process_reverse_swap", + debug_name: "claim_reverse_swap", port: Some(port_), mode: FfiCallMode::Normal, }, move || { let api_lockup_address = lockup_address.wire2api(); - move |task_callback| process_reverse_swap(api_lockup_address) + move |task_callback| claim_reverse_swap(api_lockup_address) }, ) } diff --git a/libs/sdk-core/src/swap_out/reverseswap.rs b/libs/sdk-core/src/swap_out/reverseswap.rs index 182b29132..888ea3b88 100644 --- a/libs/sdk-core/src/swap_out/reverseswap.rs +++ b/libs/sdk-core/src/swap_out/reverseswap.rs @@ -622,10 +622,10 @@ impl BTCSendSwap { async fn process_monitored_reverse_swaps(&self) -> Result<()> { let monitored = self.list_monitored().await?; debug!("Found {} monitored reverse swaps", monitored.len()); - self.process_reverse_swaps(monitored).await + self.claim_reverse_swaps(monitored).await } - async fn process_reverse_swaps(&self, reverse_swaps: Vec) -> Result<()> { + async fn claim_reverse_swaps(&self, reverse_swaps: Vec) -> Result<()> { for rsi in reverse_swaps { debug!("Processing reverse swap {rsi:?}"); @@ -682,7 +682,7 @@ impl BTCSendSwap { Ok(()) } - pub async fn process_reverse_swap(&self, lockup_address: String) -> ReverseSwapResult<()> { + pub async fn claim_reverse_swap(&self, lockup_address: String) -> ReverseSwapResult<()> { let rsis: Vec = self .list_monitored() .await? @@ -700,7 +700,7 @@ impl BTCSendSwap { "Reverse swap address {} was not found", lockup_address ))), - false => Ok(self.process_reverse_swaps(rsis).await?), + false => Ok(self.claim_reverse_swaps(rsis).await?), } } diff --git a/libs/sdk-flutter/ios/Classes/bridge_generated.h b/libs/sdk-flutter/ios/Classes/bridge_generated.h index 8c7459f9d..7408bf1ed 100644 --- a/libs/sdk-flutter/ios/Classes/bridge_generated.h +++ b/libs/sdk-flutter/ios/Classes/bridge_generated.h @@ -405,7 +405,7 @@ void wire_in_progress_swap(int64_t port_); void wire_in_progress_reverse_swaps(int64_t port_); -void wire_process_reverse_swap(int64_t port_, struct wire_uint_8_list *lockup_address); +void wire_claim_reverse_swap(int64_t port_, struct wire_uint_8_list *lockup_address); void wire_open_channel_fee(int64_t port_, struct wire_OpenChannelFeeRequest *req); @@ -558,7 +558,7 @@ static int64_t dummy_method_to_enforce_bundling(void) { dummy_var ^= ((int64_t) (void*) wire_redeem_swap); dummy_var ^= ((int64_t) (void*) wire_in_progress_swap); dummy_var ^= ((int64_t) (void*) wire_in_progress_reverse_swaps); - dummy_var ^= ((int64_t) (void*) wire_process_reverse_swap); + dummy_var ^= ((int64_t) (void*) wire_claim_reverse_swap); dummy_var ^= ((int64_t) (void*) wire_open_channel_fee); dummy_var ^= ((int64_t) (void*) wire_fetch_reverse_swap_fees); dummy_var ^= ((int64_t) (void*) wire_onchain_payment_limits); diff --git a/libs/sdk-flutter/lib/breez_sdk.dart b/libs/sdk-flutter/lib/breez_sdk.dart index 334cae05e..499dfe3ff 100644 --- a/libs/sdk-flutter/lib/breez_sdk.dart +++ b/libs/sdk-flutter/lib/breez_sdk.dart @@ -427,16 +427,16 @@ class BreezSDK { ) Future> inProgressReverseSwaps() async => _lnToolkit.inProgressReverseSwaps(); - /// Processes an individual reverse swap. + /// Claims an individual reverse swap. /// /// To be used only in the context of mobile notifications, where the notification triggers - /// an individual reverse swap to be processed. + /// an individual reverse swap to be claimed. /// /// This is taken care of automatically in the context of typical SDK usage. - Future processReverseSwap({ + Future claimReverseSwap({ required String lockupAddress, }) async { - return await _lnToolkit.processReverseSwap(lockupAddress: lockupAddress); + return await _lnToolkit.claimReverseSwap(lockupAddress: lockupAddress); } /* Swap Fee API's */ diff --git a/libs/sdk-flutter/lib/bridge_generated.dart b/libs/sdk-flutter/lib/bridge_generated.dart index 106d60199..bcc9b77c3 100644 --- a/libs/sdk-flutter/lib/bridge_generated.dart +++ b/libs/sdk-flutter/lib/bridge_generated.dart @@ -282,10 +282,10 @@ abstract class BreezSdkCore { FlutterRustBridgeTaskConstMeta get kInProgressReverseSwapsConstMeta; - /// See [BreezServices::process_reverse_swap] - Future processReverseSwap({required String lockupAddress, dynamic hint}); + /// See [BreezServices::claim_reverse_swap] + Future claimReverseSwap({required String lockupAddress, dynamic hint}); - FlutterRustBridgeTaskConstMeta get kProcessReverseSwapConstMeta; + FlutterRustBridgeTaskConstMeta get kClaimReverseSwapConstMeta; /// See [BreezServices::open_channel_fee] Future openChannelFee({required OpenChannelFeeRequest req, dynamic hint}); @@ -2876,20 +2876,20 @@ class BreezSdkCoreImpl implements BreezSdkCore { argNames: [], ); - Future processReverseSwap({required String lockupAddress, dynamic hint}) { + Future claimReverseSwap({required String lockupAddress, dynamic hint}) { var arg0 = _platform.api2wire_String(lockupAddress); return _platform.executeNormal(FlutterRustBridgeTask( - callFfi: (port_) => _platform.inner.wire_process_reverse_swap(port_, arg0), + callFfi: (port_) => _platform.inner.wire_claim_reverse_swap(port_, arg0), parseSuccessData: _wire2api_unit, parseErrorData: _wire2api_FrbAnyhowException, - constMeta: kProcessReverseSwapConstMeta, + constMeta: kClaimReverseSwapConstMeta, argValues: [lockupAddress], hint: hint, )); } - FlutterRustBridgeTaskConstMeta get kProcessReverseSwapConstMeta => const FlutterRustBridgeTaskConstMeta( - debugName: "process_reverse_swap", + FlutterRustBridgeTaskConstMeta get kClaimReverseSwapConstMeta => const FlutterRustBridgeTaskConstMeta( + debugName: "claim_reverse_swap", argNames: ["lockupAddress"], ); @@ -5856,21 +5856,21 @@ class BreezSdkCoreWire implements FlutterRustBridgeWireBase { late final _wire_in_progress_reverse_swaps = _wire_in_progress_reverse_swapsPtr.asFunction(); - void wire_process_reverse_swap( + void wire_claim_reverse_swap( int port_, ffi.Pointer lockup_address, ) { - return _wire_process_reverse_swap( + return _wire_claim_reverse_swap( port_, lockup_address, ); } - late final _wire_process_reverse_swapPtr = + late final _wire_claim_reverse_swapPtr = _lookup)>>( - 'wire_process_reverse_swap'); - late final _wire_process_reverse_swap = - _wire_process_reverse_swapPtr.asFunction)>(); + 'wire_claim_reverse_swap'); + late final _wire_claim_reverse_swap = + _wire_claim_reverse_swapPtr.asFunction)>(); void wire_open_channel_fee( int port_, diff --git a/libs/sdk-react-native/android/src/main/java/com/breezsdk/BreezSDKModule.kt b/libs/sdk-react-native/android/src/main/java/com/breezsdk/BreezSDKModule.kt index 7d310e2fc..18aa1a370 100644 --- a/libs/sdk-react-native/android/src/main/java/com/breezsdk/BreezSDKModule.kt +++ b/libs/sdk-react-native/android/src/main/java/com/breezsdk/BreezSDKModule.kt @@ -825,13 +825,13 @@ class BreezSDKModule( } @ReactMethod - fun processReverseSwap( + fun claimReverseSwap( lockupAddress: String, promise: Promise, ) { executor.execute { try { - getBreezServices().processReverseSwap(lockupAddress) + getBreezServices().claimReverseSwap(lockupAddress) promise.resolve(readableMapOf("status" to "ok")) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) diff --git a/libs/sdk-react-native/ios/RNBreezSDK.m b/libs/sdk-react-native/ios/RNBreezSDK.m index b09694383..c4409c719 100644 --- a/libs/sdk-react-native/ios/RNBreezSDK.m +++ b/libs/sdk-react-native/ios/RNBreezSDK.m @@ -289,7 +289,7 @@ @interface RCT_EXTERN_MODULE(RNBreezSDK, RCTEventEmitter) ) RCT_EXTERN_METHOD( - processReverseSwap: (NSString*)lockupAddress + claimReverseSwap: (NSString*)lockupAddress resolve: (RCTPromiseResolveBlock)resolve reject: (RCTPromiseRejectBlock)reject ) diff --git a/libs/sdk-react-native/ios/RNBreezSDK.swift b/libs/sdk-react-native/ios/RNBreezSDK.swift index 9f68d7727..7dc806c78 100644 --- a/libs/sdk-react-native/ios/RNBreezSDK.swift +++ b/libs/sdk-react-native/ios/RNBreezSDK.swift @@ -617,10 +617,10 @@ class RNBreezSDK: RCTEventEmitter { } } - @objc(processReverseSwap:resolve:reject:) - func processReverseSwap(_ lockupAddress: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { + @objc(claimReverseSwap:resolve:reject:) + func claimReverseSwap(_ lockupAddress: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { do { - try getBreezServices().processReverseSwap(lockupAddress: lockupAddress) + try getBreezServices().claimReverseSwap(lockupAddress: lockupAddress) resolve(["status": "ok"]) } catch let err { rejectErr(err: err, reject: reject) diff --git a/libs/sdk-react-native/src/index.ts b/libs/sdk-react-native/src/index.ts index 4867527ff..95c3c2c8f 100644 --- a/libs/sdk-react-native/src/index.ts +++ b/libs/sdk-react-native/src/index.ts @@ -1098,8 +1098,8 @@ export const inProgressReverseSwaps = async (): Promise => { return response } -export const processReverseSwap = async (lockupAddress: string): Promise => { - await BreezSDK.processReverseSwap(lockupAddress) +export const claimReverseSwap = async (lockupAddress: string): Promise => { + await BreezSDK.claimReverseSwap(lockupAddress) } export const maxReverseSwapAmount = async (): Promise => {