Merge pull request #8 from dingzuhua2017/master

null-safely
polkawallet-io · Oct 11, 2021 · 01778d2 · 01778d2
2 parents 324d5dc + 2c2532a
commit 01778d2
Show file tree

Hide file tree

Showing 16 changed files with 78 additions and 75 deletions.
diff --git a/lib/pages/governance.dart b/lib/pages/governance.dart
@@ -43,7 +43,7 @@ class Gov extends StatelessWidget {
               ),
             ),
             Expanded(
-              child: plugin.sdk.api!.connectedNode == null
+              child: plugin.sdk.api.connectedNode == null
                   ? Container(
                       padding: EdgeInsets.only(
                           top: MediaQuery.of(context).size.width / 2),

diff --git a/lib/pages/governance/council/council.dart b/lib/pages/governance/council/council.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:polkawallet_plugin_kusama/common/components/infoItem.dart';
 import 'package:polkawallet_plugin_kusama/pages/governance/council/candidateDetailPage.dart';
 import 'package:polkawallet_plugin_kusama/pages/governance/council/councilVotePage.dart';
 import 'package:polkawallet_plugin_kusama/polkawallet_plugin_kusama.dart';
@@ -34,7 +33,7 @@ class _CouncilState extends State<Council> {
   bool _votesExpanded = false;
 
   Future<void> _fetchCouncilInfo() async {
-    if (widget.plugin.sdk.api!.connectedNode == null) {
+    if (widget.plugin.sdk.api.connectedNode == null) {
       return;
     }
     await widget.plugin.service!.gov.queryCouncilVotes();

diff --git a/lib/pages/governance/council/councilPage.dart b/lib/pages/governance/council/councilPage.dart
@@ -29,7 +29,7 @@ class _GovernanceState extends State<CouncilPage> {
     super.initState();
 
     WidgetsBinding.instance!.addPostFrameCallback((_) {
-      if (widget.plugin.sdk.api!.connectedNode == null) {
+      if (widget.plugin.sdk.api.connectedNode == null) {
         return;
       }
       widget.plugin.service!.gov.queryCouncilInfo();

diff --git a/lib/pages/governance/council/motionDetailPage.dart b/lib/pages/governance/council/motionDetailPage.dart
@@ -44,7 +44,7 @@ class _MotionDetailPageState extends State<MotionDetailPage> {
   Future<List?> _getExternalLinks(int? id) async {
     if (_links != null) return _links;
 
-    final List? res = await widget.plugin.sdk.api!.gov!.getExternalLinks(
+    final List? res = await widget.plugin.sdk.api.gov.getExternalLinks(
       GenExternalLinksParams.fromJson(
           {'data': id.toString(), 'type': 'council'}),
     );
@@ -60,7 +60,7 @@ class _MotionDetailPageState extends State<MotionDetailPage> {
     if (_treasuryProposal != null) return _treasuryProposal;
 
     final Map? data =
-        await widget.plugin.sdk.api!.gov!.queryTreasuryProposal(id!);
+        await widget.plugin.sdk.api.gov.queryTreasuryProposal(id!);
     if (data != null) {
       setState(() {
         _treasuryProposal = data;

diff --git a/lib/pages/governance/democracy/democracy.dart b/lib/pages/governance/democracy/democracy.dart
@@ -35,7 +35,7 @@ class _DemocracyState extends State<Democracy> {
   List _unlocks = [];
 
   Future<void> _queryDemocracyUnlocks() async {
-    final List? unlocks = await widget.plugin.sdk.api!.gov!
+    final List? unlocks = await widget.plugin.sdk.api.gov
         .getDemocracyUnlocks(widget.keyring.current.address!);
     if (mounted && unlocks != null) {
       setState(() {
@@ -47,7 +47,7 @@ class _DemocracyState extends State<Democracy> {
   Future<List?> _getExternalLinks(BigInt? id) async {
     if (_links[id] != null) return _links[id];
 
-    final List? res = await widget.plugin.sdk.api!.gov!.getExternalLinks(
+    final List? res = await widget.plugin.sdk.api.gov.getExternalLinks(
       GenExternalLinksParams.fromJson(
           {'data': id.toString(), 'type': 'referendum'}),
     );
@@ -60,7 +60,7 @@ class _DemocracyState extends State<Democracy> {
   }
 
   Future<void> _fetchReferendums() async {
-    if (widget.plugin.sdk.api!.connectedNode == null) {
+    if (widget.plugin.sdk.api.connectedNode == null) {
       return;
     }
     widget.plugin.service!.gov.getReferendumVoteConvictions();
@@ -111,7 +111,7 @@ class _DemocracyState extends State<Democracy> {
   @override
   void initState() {
     super.initState();
-    if (widget.plugin.sdk.api!.connectedNode != null) {
+    if (widget.plugin.sdk.api.connectedNode != null) {
       widget.plugin.service!.gov.subscribeBestNumber();
     }
 

diff --git a/lib/pages/governance/democracy/proposalDetailPage.dart b/lib/pages/governance/democracy/proposalDetailPage.dart
@@ -40,7 +40,7 @@ class _ProposalDetailPageState extends State<ProposalDetailPage> {
   Future<List?> _getExternalLinks(BigInt id) async {
     if (_links != null) return _links;
 
-    final List? res = await widget.plugin.sdk.api!.gov!.getExternalLinks(
+    final List? res = await widget.plugin.sdk.api.gov.getExternalLinks(
       GenExternalLinksParams.fromJson(
           {'data': id.toString(), 'type': 'proposal'}),
     );

diff --git a/lib/pages/governance/democracy/proposals.dart b/lib/pages/governance/democracy/proposals.dart
@@ -18,7 +18,7 @@ class _ProposalsState extends State<Proposals> {
       new GlobalKey<RefreshIndicatorState>();
 
   Future<void> _fetchData() async {
-    if (widget.plugin.sdk.api!.connectedNode == null) {
+    if (widget.plugin.sdk.api.connectedNode == null) {
       return;
     }
     await widget.plugin.service!.gov.queryProposals();

diff --git a/lib/pages/governance/treasury/spendProposalPage.dart b/lib/pages/governance/treasury/spendProposalPage.dart
@@ -37,7 +37,7 @@ class _SpendProposalPageState extends State<SpendProposalPage> {
   Future<List?> _getExternalLinks(int id) async {
     if (_links != null) return _links;
 
-    final List? res = await widget.plugin.sdk.api!.gov!.getExternalLinks(
+    final List? res = await widget.plugin.sdk.api.gov.getExternalLinks(
       GenExternalLinksParams.fromJson(
           {'data': id.toString(), 'type': 'treasury'}),
     );

diff --git a/lib/pages/staking/actions/redeemPage.dart b/lib/pages/staking/actions/redeemPage.dart
@@ -26,7 +26,7 @@ class _RedeemPageState extends State<RedeemPage> {
     final String stashId = widget.plugin.store!.staking.ownStashInfo!.stashId ??
         widget.plugin.store!.staking.ownStashInfo!.account!.accountId!;
     final int? spans =
-        await widget.plugin.sdk.api!.staking!.getSlashingSpans(stashId);
+        await widget.plugin.sdk.api.staking.getSlashingSpans(stashId);
     setState(() {
       _slashingSpans = spans;
     });
@@ -36,12 +36,14 @@ class _RedeemPageState extends State<RedeemPage> {
   @override
   Widget build(BuildContext context) {
     final dic = I18n.of(context)!.getDic(i18n_full_dic_kusama, 'common');
-    final dicStaking = I18n.of(context)!.getDic(i18n_full_dic_kusama, 'staking')!;
+    final dicStaking =
+        I18n.of(context)!.getDic(i18n_full_dic_kusama, 'staking')!;
     final symbol = widget.plugin.networkState.tokenSymbol![0];
     final decimals = widget.plugin.networkState.tokenDecimals![0];
 
     final redeemable = Fmt.balance(
-        widget.plugin.store!.staking.ownStashInfo!.account!.redeemable.toString(),
+        widget.plugin.store!.staking.ownStashInfo!.account!.redeemable
+            .toString(),
         decimals,
         length: decimals);
     return Scaffold(

diff --git a/lib/pages/staking/actions/setPayeePage.dart b/lib/pages/staking/actions/setPayeePage.dart
@@ -214,7 +214,7 @@ class _PayeeSelectorState extends State<PayeeSelector> {
             ? Padding(
                 padding: EdgeInsets.only(left: 16, right: 16),
                 child: AddressInputField(
-                  widget.plugin.sdk.api!,
+                  widget.plugin.sdk.api,
                   widget.keyring.allWithContacts,
                   initialValue: _rewardAccount ?? defaultAcc,
                   onChanged: (acc) {

diff --git a/lib/pages/staking/actions/stakingDetailPage.dart b/lib/pages/staking/actions/stakingDetailPage.dart
@@ -18,12 +18,14 @@ class StakingDetailPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final dicStaking = I18n.of(context)!.getDic(i18n_full_dic_kusama, 'staking')!;
+    final dicStaking =
+        I18n.of(context)!.getDic(i18n_full_dic_kusama, 'staking')!;
     final decimals = plugin.networkState.tokenDecimals![0];
     final symbol = plugin.networkState.tokenSymbol![0];
     final TxData detail = ModalRoute.of(context)!.settings.arguments as TxData;
     List<TxDetailInfoItem> info = <TxDetailInfoItem>[
-      TxDetailInfoItem(label: dicStaking['action'], content: Text(detail.call!)),
+      TxDetailInfoItem(
+          label: dicStaking['action'], content: Text(detail.call!)),
     ];
     List? params = detail.params!.isEmpty ? [] : jsonDecode(detail.params!);
     if (params != null) {
@@ -38,7 +40,7 @@ class StakingDetailPage extends StatelessWidget {
             break;
           case "AccountId":
             value = value.contains('0x') ? value : '0x$value';
-            final ss58 = plugin.sdk.api!.connectedNode?.ss58;
+            final ss58 = plugin.sdk.api.connectedNode?.ss58;
             final pubKeyAddressMap = plugin.store!.accounts.pubKeyAddressMap;
             final address = ss58 != null &&
                     pubKeyAddressMap != null &&

diff --git a/lib/service/gov.dart b/lib/service/gov.dart
@@ -11,51 +11,51 @@ class ApiGov {
 
   final PluginKusama plugin;
   final Keyring keyring;
-  final PolkawalletApi? api;
+  final PolkawalletApi api;
   final PluginStore? store;
 
   Future<void> updateIconsAndIndices(List addresses) async {
     final ls = addresses.toList();
     ls.removeWhere((e) => store!.accounts.addressIconsMap.keys.contains(e));
 
     final List<List?> res = await Future.wait([
-      api!.account.getAddressIcons(ls),
-      api!.account.queryIndexInfo(ls),
+      api.account.getAddressIcons(ls),
+      api.account.queryIndexInfo(ls),
     ]);
     store!.accounts.setAddressIconsMap(res[0]!);
     store!.accounts.setAddressIndex(res[1]!);
   }
 
   Future<void> subscribeBestNumber() async {
-    api!.setting!.subscribeBestNumber((bestNum) {
+    api.setting.subscribeBestNumber((bestNum) {
       store!.gov.setBestNumber(BigInt.parse(bestNum.toString()));
     });
   }
 
   Future<void> unsubscribeBestNumber() async {
-    api!.setting!.unsubscribeBestNumber();
+    api.setting.unsubscribeBestNumber();
   }
 
   Future<void> updateBestNumber() async {
-    final bestNumber = await api!.service!.webView!
+    final bestNumber = await api.service.webView!
         .evalJavascript('api.derive.chain.bestNumber()');
     store!.gov.setBestNumber(BigInt.parse(bestNumber.toString()));
   }
 
   Future<List?> getReferendumVoteConvictions() async {
-    final List? res = await api!.gov!.getReferendumVoteConvictions();
+    final List? res = await api.gov.getReferendumVoteConvictions();
     store!.gov.setReferendumVoteConvictions(res);
     return res;
   }
 
   Future<List> queryReferendums() async {
-    final data = await api!.gov!.queryReferendums(keyring.current.address!);
+    final data = await api.gov.queryReferendums(keyring.current.address!);
     store!.gov.setReferendums(data);
     return data;
   }
 
   Future<List> queryProposals() async {
-    final data = await api!.gov!.queryProposals();
+    final data = await api.gov.queryProposals();
     store!.gov.setProposals(data);
 
     final List<String?> addresses = [];
@@ -69,20 +69,20 @@ class ApiGov {
   }
 
   Future<Map> queryCouncilVotes() async {
-    final dynamic votes = await api!.gov!.queryCouncilVotes();
+    final dynamic votes = await api.gov.queryCouncilVotes();
     store!.gov.setCouncilVotes(votes);
     return votes;
   }
 
   Future<Map> queryUserCouncilVote() async {
     final dynamic votes =
-        await api!.gov!.queryUserCouncilVote(keyring.current.address!);
+        await api.gov.queryUserCouncilVote(keyring.current.address!);
     store!.gov.setUserCouncilVotes(votes);
     return votes;
   }
 
   Future<Map?> queryCouncilInfo() async {
-    Map? info = await api!.gov!.queryCouncilInfo();
+    Map? info = await api.gov.queryCouncilInfo();
     if (info != null) {
       store!.gov.setCouncilInfo(info);
 
@@ -97,7 +97,7 @@ class ApiGov {
   }
 
   Future<List?> queryCouncilMembers() async {
-    final dynamic members = await api!.service!.webView!
+    final dynamic members = await api.service.webView!
         .evalJavascript('api.query.council.members()');
     if (members != null) {
       store!.gov.setCouncilInfo(Map<String, dynamic>.from({
@@ -111,13 +111,13 @@ class ApiGov {
   }
 
   Future<List<CouncilMotionData>> queryCouncilMotions() async {
-    final data = await api!.gov!.queryCouncilMotions();
+    final data = await api.gov.queryCouncilMotions();
     store!.gov.setCouncilMotions(data);
     return data;
   }
 
   Future<TreasuryOverviewData> queryTreasuryOverview() async {
-    final data = await api!.gov!.queryTreasuryOverview();
+    final data = await api.gov.queryTreasuryOverview();
     store!.gov.setTreasuryOverview(data);
 
     final List<String?> addresses = [];
@@ -134,7 +134,7 @@ class ApiGov {
   }
 
   Future<List> queryTreasuryTips() async {
-    final data = await api!.gov!.queryTreasuryTips();
+    final data = await api.gov.queryTreasuryTips();
     store!.gov.setTreasuryTips(data);
 
     List<String?> addresses = [];

diff --git a/lib/service/index.dart b/lib/service/index.dart
@@ -23,7 +23,7 @@ class PluginApi {
       context: context,
       builder: (_) {
         return PasswordInputDialog(
-          plugin.sdk.api!,
+          plugin.sdk.api,
           title: Text(
               I18n.of(context)!.getDic(i18n_full_dic_ui, 'common')!['unlock']!),
           account: acc,
@@ -34,8 +34,9 @@ class PluginApi {
   }
 
   Future<String> getRuntimeModuleName(List<String> modules) async {
-    final res = await Future.wait(modules.map((e) =>
-        plugin.sdk.webView!.evalJavascript('(api.tx.$e != undefined ? {} : null)', wrapPromise: false)));
+    final res = await Future.wait(modules.map((e) => plugin.sdk.webView!
+        .evalJavascript('(api.tx.$e != undefined ? {} : null)',
+            wrapPromise: false)));
     print(res);
     return modules[res.indexWhere((e) => e != null)];
   }