diff --git a/cyberwow/lib/controller/rpc/rpc2View.dart b/cyberwow/lib/controller/rpc/rpc2View.dart index c81083c..cd260e6 100644 --- a/cyberwow/lib/controller/rpc/rpc2View.dart +++ b/cyberwow/lib/controller/rpc/rpc2View.dart @@ -50,7 +50,7 @@ Map txView(Map x) { (k,v) => _remove.contains(k) ); - final _tx = _filteredTx.map + final _formattedTx = _filteredTx.map ( (k, v) { if (k == 'id_hash') { @@ -102,11 +102,11 @@ Map txView(Map x) { 'i/o', 'size', ] - .where((k) => _tx.keys.contains(k)) + .where((k) => _formattedTx.keys.contains(k)) .toList(); final _sortedTx = { - for (final k in keys) k: _tx[k] + for (final k in keys) k: _formattedTx[k] }; return _sortedTx; diff --git a/cyberwow/lib/controller/rpc/rpcView.dart b/cyberwow/lib/controller/rpc/rpcView.dart index 2967d38..7d80184 100644 --- a/cyberwow/lib/controller/rpc/rpcView.dart +++ b/cyberwow/lib/controller/rpc/rpcView.dart @@ -56,7 +56,7 @@ Map getConnectionView(Map x) { (k,v) => _remove.contains(k) ); - final _conn = _filteredConn.map + final _formattedConn = _filteredConn.map ( (k, v) { if (k == 'connection_id') { @@ -97,19 +97,19 @@ Map getConnectionView(Map x) { 'avg_upload', 'pruning_seed', ] - .where((k) => _conn.keys.contains(k)) + .where((k) => _formattedConn.keys.contains(k)) .toList(); final _sortedConn = { - for (final k in keys) k: _conn[k] + for (final k in keys) k: _formattedConn[k] }; - final _cleanupConn = _sortedConn..removeWhere + final _cleanedUpConn = _sortedConn..removeWhere ( (k,v) => k == 'pruning_seed' && x[k] == 0 ); - return _cleanupConn; + return _cleanedUpConn; } Map simpleHeight(int height, Map x) { @@ -162,14 +162,19 @@ Map getInfoView(Map x) { (k,v) => _remove.contains(k) ); - final _formattedInfo = _filteredInfo.map + final Map _hashRate = {'hash_rate': _filteredInfo['difficulty'] / 300}; + final Map _ammendedInfo = { + ..._filteredInfo, + ..._hashRate, + }; + + final _formattedInfo = _ammendedInfo.map ( (k, v) { if (k == 'top_block_hash') { return MapEntry(k, trimHash(v)); } - const sizeField = [ 'block_size_limit', @@ -177,11 +182,11 @@ Map getInfoView(Map x) { 'block_weight_limit', 'block_weight_median', 'difficulty', - 'height', 'tx_count', 'cumulative_difficulty', 'free_space', 'database_size', + 'hash_rate', ]; if (sizeField.contains(k)) { final formatter = NumberFormat.compact(); @@ -196,14 +201,13 @@ Map getInfoView(Map x) { return MapEntry('uptime', format(_diff)); } - else { return MapEntry(k, v); } } ); - return _formattedInfo.map + final _cleanedUpInfo = _formattedInfo.map ( (k, v) { if (k.contains('_count') && k != 'tx_count') { @@ -215,4 +219,10 @@ Map getInfoView(Map x) { } } ); + + final _sortedInfo = { + for (final k in _cleanedUpInfo.keys.toList()..sort()) k: _cleanedUpInfo[k] + }; + + return _sortedInfo; }