From 5c5e802928ade4a4eab8c08a7005a9e74f6d1619 Mon Sep 17 00:00:00 2001 From: Erdem Yerebasmaz Date: Mon, 24 Jul 2023 15:28:36 +0300 Subject: [PATCH] Apply naming changes in the SDK Addresses changes in: https://github.com/breez/breez-sdk/pull/350 --- integration_test/breez_sdk_test.dart | 2 +- lib/background/breez_service_initializer.dart | 4 ++-- lib/background/payment_hash_poller.dart | 2 +- lib/bloc/account/account_bloc.dart | 2 +- lib/bloc/backup/backup_bloc.dart | 2 +- lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart | 2 +- lib/bloc/currency/currency_bloc.dart | 2 +- lib/bloc/input/input_bloc.dart | 2 +- lib/bloc/lsp/lsp_bloc.dart | 4 ++-- lib/bloc/refund/refund_bloc.dart | 2 +- lib/bloc/swap_in/swap_in_bloc.dart | 2 +- lib/bloc/withdraw/withdraw_funds_bloc.dart | 2 +- lib/config.dart | 4 ++-- lib/main.dart | 2 +- lib/routes/dev/commands_list.dart | 2 +- lib/routes/home/widgets/app_bar/account_required_actions.dart | 2 +- lib/routes/home/widgets/enable_backup_dialog.dart | 2 +- .../home/widgets/payments_list/payment_item_amount.dart | 2 +- lib/routes/home/widgets/payments_list/payments_list.dart | 2 +- lib/routes/subswap/swap/swap_page.dart | 2 +- lib/services/injector.dart | 4 ++-- lib/user_app.dart | 2 +- test/bloc/account/account_bloc_test.dart | 2 +- test/bloc/input/input_bloc_test.dart | 2 +- test/mock/breez_bridge_mock.dart | 2 +- test/mock/injector_mock.dart | 4 ++-- 26 files changed, 31 insertions(+), 31 deletions(-) diff --git a/integration_test/breez_sdk_test.dart b/integration_test/breez_sdk_test.dart index 6b60aae4f..3ddc6b7a6 100644 --- a/integration_test/breez_sdk_test.dart +++ b/integration_test/breez_sdk_test.dart @@ -10,7 +10,7 @@ void main() { const input = "LNURL1DP68GURN8GHJ7MRFVA58GUMPW3EJUCM0D5HKZURF9ASH2ARG9AKXUATJDSHKGMEDD3HKW6TW" "8A4NZ0F4VFJRZVMRX5MXGWTYVYMNJDTR8PJRYEFEVD3NSVMXXSCXVVECVYER2ENRVFJKXVEKVYUNVCE4XUUX2E3H" "VCEKGEFCVG6KXDFJV9JRYFN5V9NN6MR0VA5KUZPFUCA"; - final bridge = BreezBridge(); + final bridge = BreezSDK(); final result = await bridge.parseInput(input: input); expect(result, isNotNull); // TODO real asserts diff --git a/lib/background/breez_service_initializer.dart b/lib/background/breez_service_initializer.dart index 674d5700c..7880b6428 100644 --- a/lib/background/breez_service_initializer.dart +++ b/lib/background/breez_service_initializer.dart @@ -5,9 +5,9 @@ import 'package:c_breez/bloc/account/credentials_manager.dart'; import 'package:c_breez/config.dart'; import 'package:c_breez/services/injector.dart'; -Future initializeBreezServices() async { +Future initializeBreezServices() async { final injector = ServiceInjector(); - final breezLib = injector.breezLib; + final breezLib = injector.breezSDK; final bool isBreezInitialized = await breezLib.isInitialized(); print("Is Breez Services initialized: $isBreezInitialized"); if (!isBreezInitialized) { diff --git a/lib/background/payment_hash_poller.dart b/lib/background/payment_hash_poller.dart index 9d1375bf4..531b1626e 100644 --- a/lib/background/payment_hash_poller.dart +++ b/lib/background/payment_hash_poller.dart @@ -32,7 +32,7 @@ class PaymentHashPoller { void isPaymentReceived(Timer timer) async { final injector = ServiceInjector(); - final breezLib = injector.breezLib; + final breezLib = injector.breezSDK; try { final List paymentList = await breezLib.listPayments( filter: PaymentTypeFilter.Received, diff --git a/lib/bloc/account/account_bloc.dart b/lib/bloc/account/account_bloc.dart index da5a5d073..7ef2f2d7a 100644 --- a/lib/bloc/account/account_bloc.dart +++ b/lib/bloc/account/account_bloc.dart @@ -39,7 +39,7 @@ class AccountBloc extends Cubit with HydratedMixin { Stream get paymentFiltersStream => _paymentFiltersStreamController.stream; - final BreezBridge _breezLib; + final BreezSDK _breezLib; final CredentialsManager _credentialsManager; AccountBloc( diff --git a/lib/bloc/backup/backup_bloc.dart b/lib/bloc/backup/backup_bloc.dart index cb7820b6f..0bd96a0cb 100644 --- a/lib/bloc/backup/backup_bloc.dart +++ b/lib/bloc/backup/backup_bloc.dart @@ -6,7 +6,7 @@ import 'package:breez_sdk/bridge_generated.dart' as sdk; class BackupBloc extends Cubit { final _log = FimberLog("BackupBloc"); - final BreezBridge _breezLib; + final BreezSDK _breezLib; BackupBloc(this._breezLib) : super(null) { _listenBackupEvents(); diff --git a/lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart b/lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart index 7cf4bec9e..418dc31a4 100644 --- a/lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart +++ b/lib/bloc/buy_bitcoin/moonpay/moonpay_bloc.dart @@ -11,7 +11,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; final _log = FimberLog("MoonPayBloc"); class MoonPayBloc extends Cubit { - final BreezBridge _breezLib; + final BreezSDK _breezLib; final Preferences _preferences; MoonPayBloc( diff --git a/lib/bloc/currency/currency_bloc.dart b/lib/bloc/currency/currency_bloc.dart index 3e63acc3e..3e9ce4c6d 100644 --- a/lib/bloc/currency/currency_bloc.dart +++ b/lib/bloc/currency/currency_bloc.dart @@ -6,7 +6,7 @@ import 'package:c_breez/bloc/currency/currency_state.dart'; import 'package:hydrated_bloc/hydrated_bloc.dart'; class CurrencyBloc extends Cubit with HydratedMixin { - final BreezBridge _breezLib; + final BreezSDK _breezLib; CurrencyBloc(this._breezLib) : super(CurrencyState.initial()) { _initializeCurrencyBloc(); diff --git a/lib/bloc/input/input_bloc.dart b/lib/bloc/input/input_bloc.dart index 50ca29bc8..a890f26ac 100644 --- a/lib/bloc/input/input_bloc.dart +++ b/lib/bloc/input/input_bloc.dart @@ -12,7 +12,7 @@ import 'package:rxdart/rxdart.dart'; class InputBloc extends Cubit { final _log = FimberLog("InputBloc"); - final BreezBridge _breezLib; + final BreezSDK _breezLib; final LightningLinksService _lightningLinks; final Device _device; diff --git a/lib/bloc/lsp/lsp_bloc.dart b/lib/bloc/lsp/lsp_bloc.dart index 725c9d609..d2196f87e 100644 --- a/lib/bloc/lsp/lsp_bloc.dart +++ b/lib/bloc/lsp/lsp_bloc.dart @@ -8,7 +8,7 @@ import 'package:hydrated_bloc/hydrated_bloc.dart'; import 'lsp_state.dart'; class LSPBloc extends Cubit { - final BreezBridge _breezLib; + final BreezSDK _breezLib; NodeState? _nodeState; LSPBloc(this._breezLib) : super(null) { @@ -16,7 +16,7 @@ class LSPBloc extends Cubit { // If not instruct the sdk to connect. _breezLib.nodeStateStream.where((nodeState) => nodeState != null).listen((nodeState) async { // emit first with the current selected lsp - emit(LspState(selectedLspId: await _breezLib.getLspId(), lspInfo: state?.lspInfo)); + emit(LspState(selectedLspId: await _breezLib.lspId(), lspInfo: state?.lspInfo)); _nodeState = nodeState; _refreshLspInfo(); }); diff --git a/lib/bloc/refund/refund_bloc.dart b/lib/bloc/refund/refund_bloc.dart index 550114883..2216c3125 100644 --- a/lib/bloc/refund/refund_bloc.dart +++ b/lib/bloc/refund/refund_bloc.dart @@ -8,7 +8,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; final _log = FimberLog("RefundBloc"); class RefundBloc extends Cubit { - final BreezBridge _breezLib; + final BreezSDK _breezLib; RefundBloc(this._breezLib) : super(RefundState.initial()) { _initializeRefundBloc(); diff --git a/lib/bloc/swap_in/swap_in_bloc.dart b/lib/bloc/swap_in/swap_in_bloc.dart index 2bd7fec44..9fafd08ce 100644 --- a/lib/bloc/swap_in/swap_in_bloc.dart +++ b/lib/bloc/swap_in/swap_in_bloc.dart @@ -10,7 +10,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; class SwapInBloc extends Cubit { final _log = FimberLog("SwapInBloc"); - final BreezBridge _breezLib; + final BreezSDK _breezLib; late Timer timer; SwapInBloc(this._breezLib) : super(SwapInState(null, null, isLoading: true)) { diff --git a/lib/bloc/withdraw/withdraw_funds_bloc.dart b/lib/bloc/withdraw/withdraw_funds_bloc.dart index 93a864bca..66bf1e2ff 100644 --- a/lib/bloc/withdraw/withdraw_funds_bloc.dart +++ b/lib/bloc/withdraw/withdraw_funds_bloc.dart @@ -11,7 +11,7 @@ import 'package:hydrated_bloc/hydrated_bloc.dart'; final _log = FimberLog("WithdrawFundsBloc"); class WithdrawFundsBloc extends Cubit { - final BreezBridge _breezLib; + final BreezSDK _breezLib; WithdrawFundsBloc( this._breezLib, diff --git a/lib/config.dart b/lib/config.dart index e5a4b8809..e8944e4b8 100644 --- a/lib/config.dart +++ b/lib/config.dart @@ -28,7 +28,7 @@ class Config { if (_instance == null) { _log.v("Creating Config instance"); final injector = serviceInjector ?? ServiceInjector(); - final breezLib = injector.breezLib; + final breezLib = injector.breezSDK; final breezConfig = await _getBundledConfig(); final defaultConf = await _getDefaultConf(breezLib, breezConfig.apiKey, breezConfig.nodeConfig); final defaultMempoolUrl = defaultConf.mempoolspaceUrl; @@ -49,7 +49,7 @@ class Config { } static Future _getDefaultConf( - BreezBridge breezLib, + BreezSDK breezLib, String apiKey, sdk.NodeConfig nodeConfig, { sdk.EnvironmentType environmentType = sdk.EnvironmentType.Production, diff --git a/lib/main.dart b/lib/main.dart index 55a6ea1a7..73a5f00ed 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -50,7 +50,7 @@ void main() async { BreezDateUtils.setupLocales(); await Firebase.initializeApp(); final injector = ServiceInjector(); - final breezLib = injector.breezLib; + final breezLib = injector.breezSDK; breezLib.initialize(); FirebaseMessaging.onBackgroundMessage(_onBackgroundMessage); final appDir = await getApplicationDocumentsDirectory(); diff --git a/lib/routes/dev/commands_list.dart b/lib/routes/dev/commands_list.dart index 46192faa9..b561da379 100644 --- a/lib/routes/dev/commands_list.dart +++ b/lib/routes/dev/commands_list.dart @@ -21,7 +21,7 @@ class CommandsList extends StatefulWidget { } class _CommandsListState extends State { - final _breezLib = ServiceInjector().breezLib; + final _breezLib = ServiceInjector().breezSDK; final _cliInputController = TextEditingController(); final FocusNode _cliEntryFocusNode = FocusNode(); diff --git a/lib/routes/home/widgets/app_bar/account_required_actions.dart b/lib/routes/home/widgets/app_bar/account_required_actions.dart index e31978c51..bca75b821 100644 --- a/lib/routes/home/widgets/app_bar/account_required_actions.dart +++ b/lib/routes/home/widgets/app_bar/account_required_actions.dart @@ -97,7 +97,7 @@ class AccountRequiredActionsIndicator extends StatelessWidget { useRootNavigator: false, useSafeArea: false, context: context, - builder: (_) => EnableBackupDialog(context, ServiceInjector().breezLib), + builder: (_) => EnableBackupDialog(context, ServiceInjector().breezSDK), ); }, ), diff --git a/lib/routes/home/widgets/enable_backup_dialog.dart b/lib/routes/home/widgets/enable_backup_dialog.dart index c09ceb939..eccca61b3 100644 --- a/lib/routes/home/widgets/enable_backup_dialog.dart +++ b/lib/routes/home/widgets/enable_backup_dialog.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; class EnableBackupDialog extends StatefulWidget { final BuildContext context; - final bridge.BreezBridge breezLib; + final bridge.BreezSDK breezLib; const EnableBackupDialog(this.context, this.breezLib); diff --git a/lib/routes/home/widgets/payments_list/payment_item_amount.dart b/lib/routes/home/widgets/payments_list/payment_item_amount.dart index 29ff2d1eb..8a66d3f4d 100644 --- a/lib/routes/home/widgets/payments_list/payment_item_amount.dart +++ b/lib/routes/home/widgets/payments_list/payment_item_amount.dart @@ -87,7 +87,7 @@ void main() async { MultiBlocProvider( providers: [ BlocProvider( - create: (BuildContext context) => CurrencyBloc(ServiceInjector().breezLib), + create: (BuildContext context) => CurrencyBloc(ServiceInjector().breezSDK), ), ], child: MaterialApp( diff --git a/lib/routes/home/widgets/payments_list/payments_list.dart b/lib/routes/home/widgets/payments_list/payments_list.dart index a375cf0bd..b8867cbaa 100644 --- a/lib/routes/home/widgets/payments_list/payments_list.dart +++ b/lib/routes/home/widgets/payments_list/payments_list.dart @@ -131,7 +131,7 @@ void main() async { MultiBlocProvider( providers: [ BlocProvider( - create: (BuildContext context) => CurrencyBloc(injector.breezLib), + create: (BuildContext context) => CurrencyBloc(injector.breezSDK), ), BlocProvider( create: (BuildContext context) => UserProfileBloc(injector.breezServer, injector.notifications), diff --git a/lib/routes/subswap/swap/swap_page.dart b/lib/routes/subswap/swap/swap_page.dart index 4a1e4239d..9cc44718b 100644 --- a/lib/routes/subswap/swap/swap_page.dart +++ b/lib/routes/subswap/swap/swap_page.dart @@ -23,7 +23,7 @@ class SwapPage extends StatefulWidget { } class SwapPageState extends State { - final BreezBridge breezLib = ServiceInjector().breezLib; + final BreezSDK breezLib = ServiceInjector().breezSDK; SwapInfo? swapInProgress; SwapInfo? swapUnused; String? bitcoinAddress; diff --git a/lib/services/injector.dart b/lib/services/injector.dart index ee256a169..97bfc9fb8 100644 --- a/lib/services/injector.dart +++ b/lib/services/injector.dart @@ -22,7 +22,7 @@ class ServiceInjector { DeepLinksService? _deepLinksService; // breez sdk - BreezBridge? _breezBridge; + BreezSDK? _breezSDK; LightningLinksService? _lightningLinksService; Device? _device; @@ -50,7 +50,7 @@ class ServiceInjector { return _breezServer ??= BreezServer(); } - BreezBridge get breezLib => _breezBridge ??= BreezBridge(); + BreezSDK get breezSDK => _breezSDK ??= BreezSDK(); Device get device { return _device ??= Device(); diff --git a/lib/user_app.dart b/lib/user_app.dart index fdb869595..129eedf86 100644 --- a/lib/user_app.dart +++ b/lib/user_app.dart @@ -163,7 +163,7 @@ class UserApp extends StatelessWidget { return FadeInRoute( builder: (_) => BlocProvider( create: (BuildContext context) => SwapInBloc( - ServiceInjector().breezLib, + ServiceInjector().breezSDK, ), child: const SwapPage(), ), diff --git a/test/bloc/account/account_bloc_test.dart b/test/bloc/account/account_bloc_test.dart index fab76d30f..a631a9376 100644 --- a/test/bloc/account/account_bloc_test.dart +++ b/test/bloc/account/account_bloc_test.dart @@ -35,7 +35,7 @@ void main() { test('recover node', () async { var injector = InjectorMock(); - var breezLib = injector.breezLib; + var breezLib = injector.breezSDK; injector.keychain.write(CredentialsManager.accountMnemonic, "a3eed"); AccountBloc accBloc = AccountBloc(breezLib, CredentialsManager(keyChain: injector.keychain)); diff --git a/test/bloc/input/input_bloc_test.dart b/test/bloc/input/input_bloc_test.dart index 9b25eb486..5b60789b6 100644 --- a/test/bloc/input/input_bloc_test.dart +++ b/test/bloc/input/input_bloc_test.dart @@ -31,7 +31,7 @@ void main() { }); test('lnurl', () async { - var breezLib = injector.breezLib; + var breezLib = injector.breezSDK; const input = "LNURL1DP68GURN8GHJ7MRFVA58GUMPW3EJUCM0D5HKZURF9ASH2ARG9AKXUATJDSHKGMEDD3HKW6TW" "8A4NZ0F4VFJRZVMRX5MXGWTYVYMNJDTR8PJRYEFEVD3NSVMXXSCXVVECVYER2ENRVFJKXVEKVYUNVCE4XUUX2E3H" diff --git a/test/mock/breez_bridge_mock.dart b/test/mock/breez_bridge_mock.dart index 720af612d..3b4a2cfa8 100644 --- a/test/mock/breez_bridge_mock.dart +++ b/test/mock/breez_bridge_mock.dart @@ -6,7 +6,7 @@ import 'package:breez_sdk/bridge_generated.dart'; import 'package:mockito/mockito.dart'; import 'package:rxdart/rxdart.dart'; -class BreezBridgeMock extends Mock implements BreezBridge { +class BreezSDKMock extends Mock implements BreezSDK { GreenlightCredentials credentials = GreenlightCredentials( deviceKey: Uint8List(2), deviceCert: Uint8List(2), diff --git a/test/mock/injector_mock.dart b/test/mock/injector_mock.dart index e2d2b7197..d0a6ec261 100644 --- a/test/mock/injector_mock.dart +++ b/test/mock/injector_mock.dart @@ -55,10 +55,10 @@ class InjectorMock extends Mock implements ServiceInjector { @override BreezServer get breezServer => breezServerMock; - final breezLibMock = BreezBridgeMock(); + final breezLibMock = BreezSDKMock(); @override - BreezBridge get breezLib => breezLibMock; + BreezSDK get breezSDK => breezLibMock; final preferencesMock = PreferencesMock();