diff --git a/lib/bindings/src/breez_liquid_sdk.udl b/lib/bindings/src/breez_liquid_sdk.udl index 1803bf4..370df92 100644 --- a/lib/bindings/src/breez_liquid_sdk.udl +++ b/lib/bindings/src/breez_liquid_sdk.udl @@ -24,8 +24,8 @@ enum Network { dictionary ConnectRequest { string mnemonic; - string? data_dir = null; Network network; + string? data_dir = null; }; dictionary GetInfoRequest { diff --git a/lib/bindings/tests/bindings/test_breez_liquid_sdk.kts b/lib/bindings/tests/bindings/test_breez_liquid_sdk.kts index 8b41d09..ffe9d13 100644 --- a/lib/bindings/tests/bindings/test_breez_liquid_sdk.kts +++ b/lib/bindings/tests/bindings/test_breez_liquid_sdk.kts @@ -1,7 +1,7 @@ try { var mnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about" - var connectReq = breez_liquid_sdk.ConnectRequest(mnemonic, null, breez_liquid_sdk.Network.LIQUID_TESTNET) + var connectReq = breez_liquid_sdk.ConnectRequest(mnemonic, breez_liquid_sdk.Network.LIQUID_TESTNET) var sdk = breez_liquid_sdk.connect(connectReq) var getInfoReq = breez_liquid_sdk.GetInfoRequest(false) diff --git a/lib/bindings/tests/bindings/test_breez_liquid_sdk.py b/lib/bindings/tests/bindings/test_breez_liquid_sdk.py index 7b87fe7..51c6c4a 100644 --- a/lib/bindings/tests/bindings/test_breez_liquid_sdk.py +++ b/lib/bindings/tests/bindings/test_breez_liquid_sdk.py @@ -3,10 +3,10 @@ import breez_liquid_sdk def test(): mnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about" - connect_req = breez_liquid_sdk.ConnectRequest(mnemonic = mnemonic, data_dir = None, network = breez_liquid_sdk.Network.LIQUID_TESTNET) + connect_req = breez_liquid_sdk.ConnectRequest(mnemonic, breez_liquid_sdk.Network.LIQUID_TESTNET) sdk = breez_liquid_sdk.connect(connect_req) - get_info_req = breez_liquid_sdk.GetInfoRequest(with_scan = False) + get_info_req = breez_liquid_sdk.GetInfoRequest(False) node_info = sdk.get_info(get_info_req) print(node_info) diff --git a/lib/bindings/tests/bindings/test_breez_liquid_sdk.swift b/lib/bindings/tests/bindings/test_breez_liquid_sdk.swift index fa8022d..5cbcb9d 100644 --- a/lib/bindings/tests/bindings/test_breez_liquid_sdk.swift +++ b/lib/bindings/tests/bindings/test_breez_liquid_sdk.swift @@ -2,7 +2,7 @@ import breez_liquid_sdk let mnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about"; -let connectReq = breez_liquid_sdk.ConnectRequest(mnemonic: mnemonic, dataDir: nil, network: .liquidTestnet); +let connectReq = breez_liquid_sdk.ConnectRequest(mnemonic: mnemonic, network: .liquidTestnet); let sdk = try breez_liquid_sdk.connect(req: connectReq); let getInfoReq = breez_liquid_sdk.GetInfoRequest(withScan: false); diff --git a/packages/react-native/android/src/main/java/com/breezliquidsdk/BreezLiquidSDKMapper.kt b/packages/react-native/android/src/main/java/com/breezliquidsdk/BreezLiquidSDKMapper.kt index 1653464..954ebe0 100644 --- a/packages/react-native/android/src/main/java/com/breezliquidsdk/BreezLiquidSDKMapper.kt +++ b/packages/react-native/android/src/main/java/com/breezliquidsdk/BreezLiquidSDKMapper.kt @@ -15,20 +15,20 @@ fun asConnectRequest(connectRequest: ReadableMap): ConnectRequest? { return null } val mnemonic = connectRequest.getString("mnemonic")!! - val dataDir = if (hasNonNullKey(connectRequest, "dataDir")) connectRequest.getString("dataDir") else null val network = connectRequest.getString("network")?.let { asNetwork(it) }!! + val dataDir = if (hasNonNullKey(connectRequest, "dataDir")) connectRequest.getString("dataDir") else null return ConnectRequest( mnemonic, - dataDir, network, + dataDir, ) } fun readableMapOf(connectRequest: ConnectRequest): ReadableMap { return readableMapOf( "mnemonic" to connectRequest.mnemonic, - "dataDir" to connectRequest.dataDir, "network" to connectRequest.network.name.lowercase(), + "dataDir" to connectRequest.dataDir, ) } diff --git a/packages/react-native/ios/BreezLiquidSDKMapper.swift b/packages/react-native/ios/BreezLiquidSDKMapper.swift index 3763254..873d326 100644 --- a/packages/react-native/ios/BreezLiquidSDKMapper.swift +++ b/packages/react-native/ios/BreezLiquidSDKMapper.swift @@ -6,6 +6,11 @@ enum BreezLiquidSDKMapper { guard let mnemonic = connectRequest["mnemonic"] as? String else { throw LsSdkError.Generic(message: errMissingMandatoryField(fieldName: "mnemonic", typeName: "ConnectRequest")) } + guard let networkTmp = connectRequest["network"] as? String else { + throw LsSdkError.Generic(message: errMissingMandatoryField(fieldName: "network", typeName: "ConnectRequest")) + } + let network = try asNetwork(network: networkTmp) + var dataDir: String? if hasNonNilKey(data: connectRequest, key: "dataDir") { guard let dataDirTmp = connectRequest["dataDir"] as? String else { @@ -13,23 +18,19 @@ enum BreezLiquidSDKMapper { } dataDir = dataDirTmp } - guard let networkTmp = connectRequest["network"] as? String else { - throw LsSdkError.Generic(message: errMissingMandatoryField(fieldName: "network", typeName: "ConnectRequest")) - } - let network = try asNetwork(network: networkTmp) return ConnectRequest( mnemonic: mnemonic, - dataDir: dataDir, - network: network + network: network, + dataDir: dataDir ) } static func dictionaryOf(connectRequest: ConnectRequest) -> [String: Any?] { return [ "mnemonic": connectRequest.mnemonic, - "dataDir": connectRequest.dataDir == nil ? nil : connectRequest.dataDir, "network": valueOf(network: connectRequest.network), + "dataDir": connectRequest.dataDir == nil ? nil : connectRequest.dataDir, ] } diff --git a/packages/react-native/src/index.ts b/packages/react-native/src/index.ts index 95e47e3..e9e81fb 100644 --- a/packages/react-native/src/index.ts +++ b/packages/react-native/src/index.ts @@ -19,8 +19,8 @@ const BreezLiquidSDK = NativeModules.RNBreezLiquidSDK export interface ConnectRequest { mnemonic: string - dataDir?: string network: Network + dataDir?: string } export interface GetInfoRequest {