From afbf818ab5815b07481bab41e1c1c27ffa704751 Mon Sep 17 00:00:00 2001
From: sneurlax <sneurlax@gmail.com>
Date: Wed, 19 Jul 2023 11:04:19 -0500
Subject: [PATCH] refactor InscriptionLink factory, casting

TODO replace casting throughout ordinals DTOs with refactored validation
---
 lib/dto/ordinals/address_response.dart     | 13 +-----------
 lib/dto/ordinals/feed_response.dart        | 16 ++-------------
 lib/dto/ordinals/inscription_link.dart     | 13 ++++++++++++
 lib/dto/ordinals/transaction_response.dart | 24 ++++++++++++----------
 4 files changed, 29 insertions(+), 37 deletions(-)
 create mode 100644 lib/dto/ordinals/inscription_link.dart

diff --git a/lib/dto/ordinals/address_response.dart b/lib/dto/ordinals/address_response.dart
index 7932d8ec7..5c1f66323 100644
--- a/lib/dto/ordinals/address_response.dart
+++ b/lib/dto/ordinals/address_response.dart
@@ -1,4 +1,4 @@
-import 'package:stackwallet/dto/ordinals/inscription_response.dart';
+import 'package:stackwallet/dto/ordinals/inscription_link.dart';
 
 class AddressResponse {
   final AddressLinks links;
@@ -48,14 +48,3 @@ class AddressLink {
     return AddressLink(href: json['href'] as String);
   }
 }
-
-class InscriptionLink {
-  final String href;
-  final String title;
-
-  InscriptionLink(this.href, this.title);
-
-  factory InscriptionLink.fromJson(Map<String, dynamic> json) {
-    return InscriptionLink(json['href'] as String, json['title'] as String);
-  }
-}
diff --git a/lib/dto/ordinals/feed_response.dart b/lib/dto/ordinals/feed_response.dart
index d958fbe4c..e29d2d334 100644
--- a/lib/dto/ordinals/feed_response.dart
+++ b/lib/dto/ordinals/feed_response.dart
@@ -1,3 +1,5 @@
+import 'package:stackwallet/dto/ordinals/inscription_link.dart';
+
 class FeedResponse {
   final List<InscriptionLink> inscriptions;
 
@@ -12,17 +14,3 @@ class FeedResponse {
     return FeedResponse(inscriptions: inscriptions);
   }
 }
-
-class InscriptionLink {
-  final String href;
-  final String title;
-
-  InscriptionLink({required this.href, required this.title});
-
-  factory InscriptionLink.fromJson(Map<String, dynamic> json) {
-    return InscriptionLink(
-      href: json['href'] as String ?? '',
-      title: json['title'] as String ?? '',
-    );
-  }
-}
diff --git a/lib/dto/ordinals/inscription_link.dart b/lib/dto/ordinals/inscription_link.dart
new file mode 100644
index 000000000..f23b63248
--- /dev/null
+++ b/lib/dto/ordinals/inscription_link.dart
@@ -0,0 +1,13 @@
+class InscriptionLink {
+  final String href;
+  final String title;
+
+  InscriptionLink({required this.href, required this.title});
+
+  factory InscriptionLink.fromJson(Map<String, dynamic> json) {
+    return InscriptionLink(
+      href: json['href'] as String ?? '',
+      title: json['title'] as String ?? '',
+    );
+  }
+}
diff --git a/lib/dto/ordinals/transaction_response.dart b/lib/dto/ordinals/transaction_response.dart
index b030a1daa..11912a3ad 100644
--- a/lib/dto/ordinals/transaction_response.dart
+++ b/lib/dto/ordinals/transaction_response.dart
@@ -1,3 +1,5 @@
+import 'package:stackwallet/dto/ordinals/inscription_link.dart';
+
 class TransactionResponse {
   final TransactionLinks links;
   final List<OutputLink> inputs;
@@ -18,21 +20,21 @@ class TransactionResponse {
   factory TransactionResponse.fromJson(Map<String, dynamic> json) {
     final inputsJson = json['_links']['inputs'] as List;
     final inputs = inputsJson
-        .map((inputJson) => OutputLink.fromJson(inputJson))
+        .map((inputJson) => OutputLink.fromJson(inputJson as Map<String, dynamic>))
         .toList();
 
     final outputsJson = json['_links']['outputs'] as List;
     final outputs = outputsJson
-        .map((outputJson) => OutputLink.fromJson(outputJson))
+        .map((outputJson) => OutputLink.fromJson(outputJson as Map<String, dynamic>))
         .toList();
 
     return TransactionResponse(
-      links: TransactionLinks.fromJson(json['_links']),
+      links: TransactionLinks.fromJson(json['_links'] as Map<String, dynamic>),
       inputs: inputs,
-      inscription: InscriptionLink.fromJson(json['_links']['inscription']),
+      inscription: InscriptionLink.fromJson(json['_links']['inscription'] as Map<String, dynamic>),
       outputs: outputs,
-      self: TransactionLink.fromJson(json['_links']['self']),
-      transaction: json['transaction'],
+      self: TransactionLink.fromJson(json['_links']['self'] as Map<String, dynamic>),
+      transaction: json['transaction'] as String,
     );
   }
 }
@@ -50,9 +52,9 @@ class TransactionLinks {
 
   factory TransactionLinks.fromJson(Map<String, dynamic> json) {
     return TransactionLinks(
-      block: TransactionLink.fromJson(json['block']),
-      inscription: InscriptionLink.fromJson(json['inscription']),
-      self: TransactionLink.fromJson(json['self']),
+      block: TransactionLink.fromJson(json['block'] as Map<String, dynamic>),
+      inscription: InscriptionLink.fromJson(json['inscription'] as Map<String, dynamic>),
+      self: TransactionLink.fromJson(json['self'] as Map<String, dynamic>),
     );
   }
 }
@@ -63,7 +65,7 @@ class TransactionLink {
   TransactionLink({required this.href});
 
   factory TransactionLink.fromJson(Map<String, dynamic> json) {
-    return TransactionLink(href: json['href']);
+    return TransactionLink(href: json['href'] as String);
   }
 }
 
@@ -73,6 +75,6 @@ class OutputLink {
   OutputLink({required this.href});
 
   factory OutputLink.fromJson(Map<String, dynamic> json) {
-    return OutputLink(href: json['href']);
+    return OutputLink(href: json['href'] as String);
   }
 }