TASK-3_1: Refactor blockchain related repositories codes to make them easier to read and maintain (#11)

Author: BigtoC

lib/application/blockchain_info/blockchain_info_bloc.dart

@@ -1,9 +1,9 @@
 import 'package:rxdart/rxdart.dart';
 
-import 'package:hnotes/Infrastructure/blockchain/services/blockchain_repository.dart';
+import 'package:hnotes/Infrastructure/blockchain/blockchain_info_repository.dart';
 
 class BlockchainInfoBloc {
-  final BlockchainRepository _blockchainRepository = BlockchainRepository();
+  final BlockchainInfoRepository _blockchainInfoRepository = BlockchainInfoRepository();
 
   final _latestBlockNumberData = new PublishSubject<Map<String, dynamic>>();
   final _currentGasPriceData = new PublishSubject<Map<String, dynamic>>();
@@ -26,16 +26,16 @@ class BlockchainInfoBloc {
 
   fetchAllBlockchainInfo() async {
     Future.wait([
-      _sinkData(_latestBlockNumberData, _blockchainRepository.getLatestBlockNumber()),
-      _sinkData(_currentGasPriceData, _blockchainRepository.getCurrentGasPrice()),
-      _sinkData(_currentNetworkData, _blockchainRepository.getNetwork()),
-      _sinkData(_chainIdData, _blockchainRepository.getChainId()),
-      _sinkData(_nodeClientVersionData, _blockchainRepository.getNodeClientVersion())
+      _sinkData(_latestBlockNumberData, _blockchainInfoRepository.getLatestBlockNumber()),
+      _sinkData(_currentGasPriceData, _blockchainInfoRepository.getCurrentGasPrice()),
+      _sinkData(_currentNetworkData, _blockchainInfoRepository.getNetwork()),
+      _sinkData(_chainIdData, _blockchainInfoRepository.getChainId()),
+      _sinkData(_nodeClientVersionData, _blockchainInfoRepository.getNodeClientVersion())
     ]);
   }
 
   fetchNetworkData() async {
-    await _sinkData(_currentNetworkData, _blockchainRepository.getNetwork());
+    await _sinkData(_currentNetworkData, _blockchainInfoRepository.getNetwork());
   }
 
   Future<void> _sinkData(PublishSubject data, Future fetchFunction) async {

lib/domain/blockchain/boolean_dto.dart

@@ -1,10 +1,10 @@
 import 'dart:core';
+import 'dart:convert';
 
 import 'package:http/http.dart' as http;
 
 import 'base_dto.dart';
 import 'package:hnotes/domain/common_data.dart';
-import 'package:hnotes/infrastructure/blockchain/services/request_helper.dart';
 
 
 // For response results that only contain a text string
@@ -14,7 +14,7 @@ class BooleanResultDto extends BaseResultDto {
   BooleanResultDto.fromResponse(http.Response response, String method) {
     int statusCode = response.statusCode;
     if (statusCode == 200) {
-      final bool result = phraseResponseBooleanData(response.body, "result");
+      final bool result = jsonDecode(response.body)["result"];
       this.boolean = result;
     } else {
       final String errorMsg = "Query $method failed ($statusCode): ${response.body}";

lib/domain/blockchain/number_dto.dart

@@ -1,8 +1,8 @@
+import 'dart:convert';
 import 'package:http/http.dart' as http;
 
 import 'package:hnotes/domain/common_data.dart';
 import 'package:hnotes/domain/blockchain/base_dto.dart';
-import 'package:hnotes/infrastructure/blockchain/services/request_helper.dart';
 
 
 // For response results that only contain one number
@@ -13,7 +13,7 @@ class NumberResultDto extends BaseResultDto {
   NumberResultDto.fromResponse(http.Response response, String method) {
     int statusCode = response.statusCode;
     if (statusCode == 200) {
-      final String result = phraseResponseData(response.body, "result");
+      final String result = jsonDecode(response.body)["result"];
       if (result.contains("0x")) {
         this.hexNumber = result;
         final String number = int.tryParse(result).toString();

lib/domain/blockchain/text_dto.dart

@@ -1,8 +1,8 @@
+import 'dart:convert';
 import 'package:http/http.dart' as http;
 
 import 'base_dto.dart';
 import 'package:hnotes/domain/common_data.dart';
-import 'package:hnotes/infrastructure/blockchain/services/request_helper.dart';
 
 
 // For response results that only contain a text string
@@ -12,7 +12,7 @@ class TextResultDto extends BaseResultDto {
   TextResultDto.fromResponse(http.Response response, String method) {
     int statusCode = response.statusCode;
     if (statusCode == 200) {
-      final String result = phraseResponseData(response.body, "result");
+      final String result = jsonDecode(response.body)["result"];
       this.text = result;
     } else {
       final String errorMsg = "Query $method failed ($statusCode): ${response.body}";

lib/infrastructure/blockchain/base_blockchain_repository.dart

@@ -0,0 +1,41 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:http/http.dart';
+import 'package:http/http.dart' as http;
+
+import 'package:hnotes/domain/secret/secret_model.dart';
+import 'package:hnotes/infrastructure/local_storage/secrets/secrets_repository.dart';
+
+
+class BaseBlockchainRepository {
+  final client = http.Client();
+
+  List _defaultParameter = [];
+  final _requestHeaders = {'Content-type': 'application/json'};
+  final SecretRepository _secretRepository = new SecretRepository();
+
+  Future<SecretModel> _readSecrets() async {
+    SecretModel _secretModel = await _secretRepository.getApiSecret();
+    return _secretModel;
+  }
+
+  String formPostRequestBody(String method, [var parameter]) {
+    parameter ??= _defaultParameter;
+
+    return jsonEncode({
+      "jsonrpc":"2.0",
+      "method": method,
+      "params": parameter,
+      "id": DateTime.now().millisecondsSinceEpoch
+    });
+  }
+
+  Future<Response> makePostRequest(String requestBody) async {
+    SecretModel secret = await _readSecrets();
+    return await client.post(
+      Uri.parse(secret.urlWithKey),
+      headers: _requestHeaders,
+      body: requestBody,
+    );
+  }
+}

…hain/services/blockchain_repository.dart …ockchain/blockchain_info_repository.dartlib/infrastructure/blockchain/services/blockchain_repository.dart renamed to lib/infrastructure/blockchain/blockchain_info_repository.dart lib/infrastructure/blockchain/services/blockchain_repository.dart renamed to lib/infrastructure/blockchain/blockchain_info_repository.dart

@@ -1,15 +1,10 @@
 import 'dart:async';
-import 'package:http/http.dart' as http;
 
 import 'package:hnotes/domain/blockchain/dto_collections.dart';
-import 'package:hnotes/infrastructure/blockchain/services/request_helper.dart';
+import 'package:hnotes/infrastructure/blockchain/base_blockchain_repository.dart';
 
 
-final requestHeaders = {'Content-type': 'application/json'};
-
-
-class BlockchainRepository {
-  final client = http.Client();
+class BlockchainInfoRepository extends BaseBlockchainRepository {
 
   /// Returns the number of the most recent block.
   Future<Map<String, dynamic>> getLatestBlockNumber() async {
@@ -54,9 +49,9 @@ class BlockchainRepository {
 
   /// For API responses that only contain a number (hex or decimal)
   Future<NumberResultDto> _parseNumberResultDto(String methodName) async {
-    final String requestBody = formRequestBody(methodName);
+    final String requestBody = formPostRequestBody(methodName);
 
-    return await makeRequest(requestBody)
+    return await makePostRequest(requestBody)
         .then((response) {
           NumberResultDto dto = NumberResultDto.fromResponse(response, methodName);
           return dto;
@@ -65,9 +60,9 @@ class BlockchainRepository {
 
   /// For API responses that only contain a text string
   Future<TextResultDto> _parseTextResult(String methodName) async {
-    final String requestBody = formRequestBody(methodName);
+    final String requestBody = formPostRequestBody(methodName);
 
-    return await makeRequest(requestBody)
+    return await makePostRequest(requestBody)
         .then((response) {
       TextResultDto dto = TextResultDto.fromResponse(response, methodName);
       return dto;

lib/infrastructure/blockchain/nft_repository.dart

@@ -0,0 +1,9 @@
+import 'dart:async';
+
+import 'package:hnotes/domain/blockchain/dto_collections.dart';
+import 'package:hnotes/infrastructure/blockchain/base_blockchain_repository.dart';
+
+
+class NftRepository extends BaseBlockchainRepository {
+  
+}