From 9edd68d08a74f76a1d4d3b856dab8aa30432f437 Mon Sep 17 00:00:00 2001 From: Ross Savage Date: Mon, 6 May 2024 13:56:40 +0200 Subject: [PATCH] Fix BindingWallet naming --- .../src/gen_kotlin/templates/Objects.kt | 2 +- .../src/gen_kotlin/templates/module.kt | 12 ++++----- .../src/gen_swift/templates/Objects.swift | 2 +- .../src/gen_swift/templates/module.swift | 12 ++++----- .../breezliquidsdk/BreezLiquidSDKModule.kt | 26 +++++++++---------- .../react-native/ios/RNBreezLiquidSDK.swift | 26 +++++++++---------- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/bindings/bindings-react-native/src/gen_kotlin/templates/Objects.kt b/lib/bindings/bindings-react-native/src/gen_kotlin/templates/Objects.kt index f3fc7d5..31f122c 100644 --- a/lib/bindings/bindings-react-native/src/gen_kotlin/templates/Objects.kt +++ b/lib/bindings/bindings-react-native/src/gen_kotlin/templates/Objects.kt @@ -3,7 +3,7 @@ {%- match type_ %} {%- when Type::Object ( name ) %} {% let obj = ci.get_object_definition(name).unwrap() %} -{% let obj_interface = "getBindingWallet()." %} +{% let obj_interface = "getBindingLiquidSdk()." %} {%- for func in obj.methods() -%} {%- include "TopLevelFunctionTemplate.kt" %} {% endfor %} diff --git a/lib/bindings/bindings-react-native/src/gen_kotlin/templates/module.kt b/lib/bindings/bindings-react-native/src/gen_kotlin/templates/module.kt index acdfc83..9cba8c7 100644 --- a/lib/bindings/bindings-react-native/src/gen_kotlin/templates/module.kt +++ b/lib/bindings/bindings-react-native/src/gen_kotlin/templates/module.kt @@ -11,7 +11,7 @@ import java.util.concurrent.Executors class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) { private lateinit var executor: ExecutorService - private var bindingWallet: BindingWallet? = null + private var bindingLiquidSdk: BindingLiquidSdk? = null companion object { const val TAG = "RNBreezLiquidSDK" @@ -28,9 +28,9 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext } @Throws(LiquidSdkException::class) - fun getBindingWallet(): BindingWallet { - if (bindingWallet != null) { - return bindingWallet!! + fun getBindingLiquidSdk(): BindingLiquidSdk { + if (bindingLiquidSdk != null) { + return bindingLiquidSdk!! } throw LiquidSdkException.Generic("Not initialized") @@ -51,7 +51,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext @ReactMethod fun connect(req: ReadableMap, promise: Promise) { - if (bindingWallet != null) { + if (bindingLiquidSdk != null) { promise.reject("Generic", "Already initialized") return } @@ -60,7 +60,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext try { var connectRequest = asConnectRequest(req) ?: run { throw LiquidSdkException.Generic(errMissingMandatoryField("req", "ConnectRequest")) } connectRequest.dataDir = connectRequest.dataDir.takeUnless { it.isEmpty() } ?: run { reactApplicationContext.filesDir.toString() + "/breezLiquidSdk" } - bindingWallet = connect(connectRequest) + bindingLiquidSdk = connect(connectRequest) promise.resolve(readableMapOf("status" to "ok")) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) diff --git a/lib/bindings/bindings-react-native/src/gen_swift/templates/Objects.swift b/lib/bindings/bindings-react-native/src/gen_swift/templates/Objects.swift index 95a57fb..2d6ab18 100644 --- a/lib/bindings/bindings-react-native/src/gen_swift/templates/Objects.swift +++ b/lib/bindings/bindings-react-native/src/gen_swift/templates/Objects.swift @@ -3,7 +3,7 @@ {%- match type_ %} {%- when Type::Object ( name ) %} {% let obj = ci.get_object_definition(name).unwrap() %} -{% let obj_interface = "getBindingWallet()." %} +{% let obj_interface = "getBindingLiquidSdk()." %} {%- for func in obj.methods() -%} {%- include "TopLevelFunctionTemplate.swift" %} {% endfor %} diff --git a/lib/bindings/bindings-react-native/src/gen_swift/templates/module.swift b/lib/bindings/bindings-react-native/src/gen_swift/templates/module.swift index c6bf102..e2af6e3 100644 --- a/lib/bindings/bindings-react-native/src/gen_swift/templates/module.swift +++ b/lib/bindings/bindings-react-native/src/gen_swift/templates/module.swift @@ -8,7 +8,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { public static var emitter: RCTEventEmitter! public static var hasListeners: Bool = false - private var bindingWallet: BindingWallet! + private var bindingLiquidSdk: BindingLiquidSdk! static var defaultDataDir: URL { let applicationDirectory = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first! @@ -43,9 +43,9 @@ class RNBreezLiquidSDK: RCTEventEmitter { return false } - func getBindingWallet() throws -> BindingWallet { - if bindingWallet != nil { - return bindingWallet + func getBindingLiquidSdk() throws -> BindingLiquidSdk { + if bindingLiquidSdk != nil { + return bindingLiquidSdk } throw LiquidSdkError.Generic(message: "Not initialized") @@ -59,7 +59,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { {%- endfor %} @objc(connect:resolve:reject:) func connect(_ req:[String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void { - if bindingWallet != nil { + if bindingLiquidSdk != nil { reject("Generic", "Already initialized", nil) return } @@ -67,7 +67,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { do { var connectRequest = try BreezLiquidSDKMapper.asConnectRequest(connectRequest: req) connectRequest.dataDir = connectRequest.dataDir.isEmpty ? RNBreezLiquidSDK.defaultDataDir.path : connectRequest.dataDir - bindingWallet = try BreezLiquidSDK.connect(req: connectRequest) + bindingLiquidSdk = try BreezLiquidSDK.connect(req: connectRequest) resolve(["status": "ok"]) } catch let err { rejectErr(err: err, reject: reject) diff --git a/packages/react-native/android/src/main/java/com/breezliquidsdk/BreezLiquidSDKModule.kt b/packages/react-native/android/src/main/java/com/breezliquidsdk/BreezLiquidSDKModule.kt index 78c3304..3d9c235 100644 --- a/packages/react-native/android/src/main/java/com/breezliquidsdk/BreezLiquidSDKModule.kt +++ b/packages/react-native/android/src/main/java/com/breezliquidsdk/BreezLiquidSDKModule.kt @@ -8,7 +8,7 @@ import java.util.concurrent.Executors class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) { private lateinit var executor: ExecutorService - private var bindingWallet: BindingWallet? = null + private var bindingLiquidSdk: BindingLiquidSdk? = null companion object { const val TAG = "RNBreezLiquidSDK" @@ -25,9 +25,9 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext } @Throws(LiquidSdkException::class) - fun getBindingWallet(): BindingWallet { - if (bindingWallet != null) { - return bindingWallet!! + fun getBindingLiquidSdk(): BindingLiquidSdk { + if (bindingLiquidSdk != null) { + return bindingLiquidSdk!! } throw LiquidSdkException.Generic("Not initialized") @@ -44,7 +44,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext req: ReadableMap, promise: Promise, ) { - if (bindingWallet != null) { + if (bindingLiquidSdk != null) { promise.reject("Generic", "Already initialized") return } @@ -58,7 +58,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext connectRequest.dataDir = connectRequest.dataDir.takeUnless { it.isEmpty() } ?: run { reactApplicationContext.filesDir.toString() + "/breezLiquidSdk" } - bindingWallet = connect(connectRequest) + bindingLiquidSdk = connect(connectRequest) promise.resolve(readableMapOf("status" to "ok")) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) @@ -77,7 +77,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext asGetInfoRequest( req, ) ?: run { throw LiquidSdkException.Generic(errMissingMandatoryField("req", "GetInfoRequest")) } - val res = getBindingWallet().getInfo(getInfoRequest) + val res = getBindingLiquidSdk().getInfo(getInfoRequest) promise.resolve(readableMapOf(res)) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) @@ -96,7 +96,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext asPrepareSendRequest(req) ?: run { throw LiquidSdkException.Generic(errMissingMandatoryField("req", "PrepareSendRequest")) } - val res = getBindingWallet().prepareSendPayment(prepareSendRequest) + val res = getBindingLiquidSdk().prepareSendPayment(prepareSendRequest) promise.resolve(readableMapOf(res)) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) @@ -115,7 +115,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext asPrepareSendResponse(req) ?: run { throw LiquidSdkException.Generic(errMissingMandatoryField("req", "PrepareSendResponse")) } - val res = getBindingWallet().sendPayment(prepareSendResponse) + val res = getBindingLiquidSdk().sendPayment(prepareSendResponse) promise.resolve(readableMapOf(res)) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) @@ -134,7 +134,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext asPrepareReceiveRequest(req) ?: run { throw LiquidSdkException.Generic(errMissingMandatoryField("req", "PrepareReceiveRequest")) } - val res = getBindingWallet().prepareReceivePayment(prepareReceiveRequest) + val res = getBindingLiquidSdk().prepareReceivePayment(prepareReceiveRequest) promise.resolve(readableMapOf(res)) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) @@ -153,7 +153,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext asPrepareReceiveResponse(req) ?: run { throw LiquidSdkException.Generic(errMissingMandatoryField("req", "PrepareReceiveResponse")) } - val res = getBindingWallet().receivePayment(prepareReceiveResponse) + val res = getBindingLiquidSdk().receivePayment(prepareReceiveResponse) promise.resolve(readableMapOf(res)) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) @@ -165,7 +165,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext fun backup(promise: Promise) { executor.execute { try { - getBindingWallet().backup() + getBindingLiquidSdk().backup() promise.resolve(readableMapOf("status" to "ok")) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) @@ -184,7 +184,7 @@ class BreezLiquidSDKModule(reactContext: ReactApplicationContext) : ReactContext asRestoreRequest( req, ) ?: run { throw LiquidSdkException.Generic(errMissingMandatoryField("req", "RestoreRequest")) } - getBindingWallet().restore(restoreRequest) + getBindingLiquidSdk().restore(restoreRequest) promise.resolve(readableMapOf("status" to "ok")) } catch (e: Exception) { promise.reject(e.javaClass.simpleName.replace("Exception", "Error"), e.message, e) diff --git a/packages/react-native/ios/RNBreezLiquidSDK.swift b/packages/react-native/ios/RNBreezLiquidSDK.swift index 5498dd8..70e1a87 100644 --- a/packages/react-native/ios/RNBreezLiquidSDK.swift +++ b/packages/react-native/ios/RNBreezLiquidSDK.swift @@ -8,7 +8,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { public static var emitter: RCTEventEmitter! public static var hasListeners: Bool = false - private var bindingWallet: BindingWallet! + private var bindingLiquidSdk: BindingLiquidSdk! static var defaultDataDir: URL { let applicationDirectory = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first! @@ -43,9 +43,9 @@ class RNBreezLiquidSDK: RCTEventEmitter { return false } - func getBindingWallet() throws -> BindingWallet { - if bindingWallet != nil { - return bindingWallet + func getBindingLiquidSdk() throws -> BindingLiquidSdk { + if bindingLiquidSdk != nil { + return bindingLiquidSdk } throw LiquidSdkError.Generic(message: "Not initialized") @@ -53,7 +53,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { @objc(connect:resolve:reject:) func connect(_ req: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { - if bindingWallet != nil { + if bindingLiquidSdk != nil { reject("Generic", "Already initialized", nil) return } @@ -61,7 +61,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { do { var connectRequest = try BreezLiquidSDKMapper.asConnectRequest(connectRequest: req) connectRequest.dataDir = connectRequest.dataDir.isEmpty ? RNBreezLiquidSDK.defaultDataDir.path : connectRequest.dataDir - bindingWallet = try BreezLiquidSDK.connect(req: connectRequest) + bindingLiquidSdk = try BreezLiquidSDK.connect(req: connectRequest) resolve(["status": "ok"]) } catch let err { rejectErr(err: err, reject: reject) @@ -72,7 +72,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { func getInfo(_ req: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { do { let getInfoRequest = try BreezLiquidSDKMapper.asGetInfoRequest(getInfoRequest: req) - var res = try getBindingWallet().getInfo(req: getInfoRequest) + var res = try getBindingLiquidSdk().getInfo(req: getInfoRequest) resolve(BreezLiquidSDKMapper.dictionaryOf(getInfoResponse: res)) } catch let err { rejectErr(err: err, reject: reject) @@ -83,7 +83,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { func prepareSendPayment(_ req: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { do { let prepareSendRequest = try BreezLiquidSDKMapper.asPrepareSendRequest(prepareSendRequest: req) - var res = try getBindingWallet().prepareSendPayment(req: prepareSendRequest) + var res = try getBindingLiquidSdk().prepareSendPayment(req: prepareSendRequest) resolve(BreezLiquidSDKMapper.dictionaryOf(prepareSendResponse: res)) } catch let err { rejectErr(err: err, reject: reject) @@ -94,7 +94,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { func sendPayment(_ req: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { do { let prepareSendResponse = try BreezLiquidSDKMapper.asPrepareSendResponse(prepareSendResponse: req) - var res = try getBindingWallet().sendPayment(req: prepareSendResponse) + var res = try getBindingLiquidSdk().sendPayment(req: prepareSendResponse) resolve(BreezLiquidSDKMapper.dictionaryOf(sendPaymentResponse: res)) } catch let err { rejectErr(err: err, reject: reject) @@ -105,7 +105,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { func prepareReceivePayment(_ req: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { do { let prepareReceiveRequest = try BreezLiquidSDKMapper.asPrepareReceiveRequest(prepareReceiveRequest: req) - var res = try getBindingWallet().prepareReceivePayment(req: prepareReceiveRequest) + var res = try getBindingLiquidSdk().prepareReceivePayment(req: prepareReceiveRequest) resolve(BreezLiquidSDKMapper.dictionaryOf(prepareReceiveResponse: res)) } catch let err { rejectErr(err: err, reject: reject) @@ -116,7 +116,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { func receivePayment(_ req: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { do { let prepareReceiveResponse = try BreezLiquidSDKMapper.asPrepareReceiveResponse(prepareReceiveResponse: req) - var res = try getBindingWallet().receivePayment(req: prepareReceiveResponse) + var res = try getBindingLiquidSdk().receivePayment(req: prepareReceiveResponse) resolve(BreezLiquidSDKMapper.dictionaryOf(receivePaymentResponse: res)) } catch let err { rejectErr(err: err, reject: reject) @@ -126,7 +126,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { @objc(backup:reject:) func backup(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { do { - try getBindingWallet().backup() + try getBindingLiquidSdk().backup() resolve(["status": "ok"]) } catch let err { rejectErr(err: err, reject: reject) @@ -137,7 +137,7 @@ class RNBreezLiquidSDK: RCTEventEmitter { func restore(_ req: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) { do { let restoreRequest = try BreezLiquidSDKMapper.asRestoreRequest(restoreRequest: req) - try getBindingWallet().restore(req: restoreRequest) + try getBindingLiquidSdk().restore(req: restoreRequest) resolve(["status": "ok"]) } catch let err { rejectErr(err: err, reject: reject)