From fdeb66e6433ab772d8bd07f1c7ff3fa7dc0736ff Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Mon, 10 Feb 2020 21:35:44 +0200 Subject: [PATCH] CWA-169 | removed setup_locator and got the box as parameter in MorphTokenExchangeProvider --- lib/main.dart | 3 --- lib/router.dart | 5 +++-- lib/src/domain/common/setup_locator.dart | 7 ------- .../exchange/morphtoken/morphtoken_exchange_provider.dart | 5 ++--- lib/src/stores/exchange_trade/exchange_trade_store.dart | 7 +++++-- pubspec.lock | 7 ------- pubspec.yaml | 1 - 7 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 lib/src/domain/common/setup_locator.dart diff --git a/lib/main.dart b/lib/main.dart index 18da983f6..2cf7e5911 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -35,7 +35,6 @@ import 'package:cake_wallet/src/domain/common/wallet_type.dart'; import 'package:cake_wallet/src/domain/services/wallet_service.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/domain/common/language.dart'; -import 'package:cake_wallet/src/domain/common/setup_locator.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -66,8 +65,6 @@ void main() async { await Hive.openBox(Trade.boxName, encryptionKey: tradesBoxKey); final walletInfoSource = await Hive.openBox(WalletInfo.boxName); - setupLocator(trades); - final sharedPreferences = await SharedPreferences.getInstance(); final walletService = WalletService(); final walletListService = WalletListService( diff --git a/lib/router.dart b/lib/router.dart index 1698737c6..03c7e477a 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -395,7 +395,8 @@ class Router { ProxyProvider( update: (_, settingsStore, __) => ExchangeTradeStore( trade: settings.arguments as Trade, - walletStore: walletStore), + walletStore: walletStore, + trades: trades), ), ProxyProvider( update: (_, settingsStore, __) => SendStore( @@ -455,7 +456,7 @@ class Router { providerList: [ xmrtoprovider, ChangeNowExchangeProvider(), - MorphTokenExchangeProvider() + MorphTokenExchangeProvider(trades: trades) ], walletStore: walletStore); }), diff --git a/lib/src/domain/common/setup_locator.dart b/lib/src/domain/common/setup_locator.dart deleted file mode 100644 index f9c991596..000000000 --- a/lib/src/domain/common/setup_locator.dart +++ /dev/null @@ -1,7 +0,0 @@ -import 'package:get_it/get_it.dart'; - -GetIt locator = GetIt.instance; - -void setupLocator(T instance) { - locator.registerSingleton(instance); -} \ No newline at end of file diff --git a/lib/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart b/lib/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart index e90b924d7..af26e7203 100644 --- a/lib/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart +++ b/lib/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart @@ -19,10 +19,9 @@ import 'package:cake_wallet/src/domain/bitcoin_cash/bitcoin_cash_amount_format.d import 'package:cake_wallet/src/domain/dash/dash_amount_format.dart'; import 'package:cake_wallet/src/domain/ethereum/ethereum_amount_format.dart'; import 'package:cake_wallet/src/domain/litecoin/litecoin_amount_format.dart'; -import 'package:cake_wallet/src/domain/common/setup_locator.dart'; class MorphTokenExchangeProvider extends ExchangeProvider { - MorphTokenExchangeProvider() + MorphTokenExchangeProvider({@required this.trades}) : super( pairList: [ ExchangePair(from: CryptoCurrency.xmr, to: CryptoCurrency.eth), @@ -61,7 +60,7 @@ class MorphTokenExchangeProvider extends ExchangeProvider { ExchangePair(from: CryptoCurrency.btc, to: CryptoCurrency.xmr) ]); - final trades = locator.get>(); + Box trades; static const apiUri = 'https://api.morphtoken.com'; static const _morphURISuffix = '/morph'; diff --git a/lib/src/stores/exchange_trade/exchange_trade_store.dart b/lib/src/stores/exchange_trade/exchange_trade_store.dart index 008d763f5..f65357faa 100644 --- a/lib/src/stores/exchange_trade/exchange_trade_store.dart +++ b/lib/src/stores/exchange_trade/exchange_trade_store.dart @@ -8,6 +8,7 @@ import 'package:cake_wallet/src/domain/exchange/exchange_provider_description.da import 'package:cake_wallet/src/domain/exchange/xmrto/xmrto_exchange_provider.dart'; import 'package:cake_wallet/src/domain/exchange/morphtoken/morphtoken_exchange_provider.dart'; import 'package:cake_wallet/src/stores/wallet/wallet_store.dart'; +import 'package:hive/hive.dart'; part 'exchange_trade_store.g.dart'; @@ -15,7 +16,7 @@ class ExchangeTradeStore = ExchangeTradeStoreBase with _$ExchangeTradeStore; abstract class ExchangeTradeStoreBase with Store { ExchangeTradeStoreBase( - {@required this.trade, @required WalletStore walletStore}) { + {@required this.trade, @required WalletStore walletStore, @required this.trades}) { isSendable = trade.from == walletStore.type || trade.provider == ExchangeProviderDescription.xmrto; @@ -27,7 +28,7 @@ abstract class ExchangeTradeStoreBase with Store { _provider = ChangeNowExchangeProvider(); break; case ExchangeProviderDescription.morphToken: - _provider = MorphTokenExchangeProvider(); + _provider = MorphTokenExchangeProvider(trades: trades); break; } @@ -45,6 +46,8 @@ abstract class ExchangeTradeStoreBase with Store { Timer _timer; + Box trades; + @override void dispose() { super.dispose(); diff --git a/pubspec.lock b/pubspec.lock index 2c3b118d1..d4adb3dbb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -301,13 +301,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.19" - get_it: - dependency: "direct main" - description: - name: get_it - url: "https://pub.dartlang.org" - source: hosted - version: "3.1.0" glob: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 002f95960..e20521171 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,7 +46,6 @@ dependencies: hive: ^1.2.0 hive_flutter: ^0.2.1 package_info: ^0.4.0+13 - get_it: ^3.1.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons.