Skip to content

exchange serialization bugfix and partial test coverage #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2022
Merged

exchange serialization bugfix and partial test coverage #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba576c0
exchange serialization bugfix and partial test coverage
julian-CStack Aug 29, 2022
6b534a4
possible workflow tests fix
julian-CStack Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions lib/services/change_now/change_now.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@ abstract class ChangeNow {
static const String authority = "api.changenow.io";
static const String apiVersion = "/v1";

/// set this to override using standard http client. Useful for testing
static http.Client? client;

static Uri _buildUri(String path, Map<String, dynamic>? params) {
return Uri.https(authority, apiVersion + path, params);
}

static Future<dynamic> _makeGetRequest(Uri uri) async {
final client = http.Client();
final client = ChangeNow.client ?? http.Client();
try {
final response = await client.get(
uri,
Expand All @@ -44,7 +47,7 @@ abstract class ChangeNow {
Uri uri,
Map<String, String> body,
) async {
final client = http.Client();
final client = ChangeNow.client ?? http.Client();
try {
final response = await client.post(
uri,
Expand Down Expand Up @@ -205,8 +208,9 @@ abstract class ChangeNow {
static Future<ChangeNowResponse<Decimal>> getMinimalExchangeAmount({
required String fromTicker,
required String toTicker,
String? apiKey,
}) async {
Map<String, dynamic>? params = {"api_key": kChangeNowApiKey};
Map<String, dynamic>? params = {"api_key": apiKey ?? kChangeNowApiKey};

final uri = _buildUri("/min-amount/${fromTicker}_$toTicker", params);

Expand Down Expand Up @@ -244,8 +248,9 @@ abstract class ChangeNow {
required String fromTicker,
required String toTicker,
required Decimal fromAmount,
String? apiKey,
}) async {
Map<String, dynamic> params = {"api_key": kChangeNowApiKey};
Map<String, dynamic> params = {"api_key": apiKey ?? kChangeNowApiKey};

final uri = _buildUri(
"/exchange-amount/${fromAmount.toString()}/${fromTicker}_$toTicker",
Expand Down Expand Up @@ -292,9 +297,10 @@ abstract class ChangeNow {
// to freeze estimated amount that you got in this method. Current estimated
// amount would be valid until time in field "validUntil"
bool useRateId = true,
String? apiKey,
}) async {
Map<String, dynamic> params = {
"api_key": kChangeNowApiKey,
"api_key": apiKey ?? kChangeNowApiKey,
"useRateId": useRateId.toString(),
};

Expand Down Expand Up @@ -337,8 +343,11 @@ abstract class ChangeNow {
/// time and the market info gets updates, so make sure to refresh the list
/// occasionally. One time per minute is sufficient.
static Future<ChangeNowResponse<List<FixedRateMarket>>>
getAvailableFixedRateMarkets() async {
final uri = _buildUri("/market-info/fixed-rate/$kChangeNowApiKey", null);
getAvailableFixedRateMarkets({
String? apiKey,
}) async {
final uri = _buildUri(
"/market-info/fixed-rate/${apiKey ?? kChangeNowApiKey}", null);

try {
// json array is expected here
Expand Down Expand Up @@ -406,6 +415,7 @@ abstract class ChangeNow {
String contactEmail = "",
String refundAddress = "",
String refundExtraId = "",
String? apiKey,
}) async {
final Map<String, String> map = {
"from": fromTicker,
Expand All @@ -420,14 +430,14 @@ abstract class ChangeNow {
"refundExtraId": refundExtraId,
};

final uri = _buildUri("/transactions/$kChangeNowApiKey", null);
final uri = _buildUri("/transactions/${apiKey ?? kChangeNowApiKey}", null);

try {
// simple json object is expected here
final json = await _makePostRequest(uri, map);

// pass in date to prevent using default 1970 date
json["date"] = DateTime.now();
json["date"] = DateTime.now().toString();

try {
final value = ExchangeTransaction.fromJson(
Expand Down Expand Up @@ -468,6 +478,7 @@ abstract class ChangeNow {
String contactEmail = "",
String refundAddress = "",
String refundExtraId = "",
String? apiKey,
}) async {
final Map<String, String> map = {
"from": fromTicker,
Expand All @@ -483,14 +494,15 @@ abstract class ChangeNow {
"rateId": rateId,
};

final uri = _buildUri("/transactions/fixed-rate/$kChangeNowApiKey", null);
final uri = _buildUri(
"/transactions/fixed-rate/${apiKey ?? kChangeNowApiKey}", null);

try {
// simple json object is expected here
final json = await _makePostRequest(uri, map);

// pass in date to prevent using default 1970 date
json["date"] = DateTime.now();
json["date"] = DateTime.now().toString();

try {
final value = ExchangeTransaction.fromJson(
Expand Down Expand Up @@ -520,8 +532,10 @@ abstract class ChangeNow {
static Future<ChangeNowResponse<ExchangeTransactionStatus>>
getTransactionStatus({
required String id,
String? apiKey,
}) async {
final uri = _buildUri("/transactions/$id/$kChangeNowApiKey", null);
final uri =
_buildUri("/transactions/$id/${apiKey ?? kChangeNowApiKey}", null);

try {
// simple json object is expected here
Expand Down
Loading