Merge pull request #64 from soramitsu/FLW-1725-CEX-accounts-QR-codes

Cex qr decoder
soramitsu · Apr 18, 2022 · 8ffd885 · 8ffd885
2 parents e8111ba + 464221e
commit 8ffd885
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 31 deletions.
diff --git a/FearlessUtils/Classes/QR/CexQRCommon.swift b/FearlessUtils/Classes/QR/CexQRCommon.swift
@@ -0,0 +1,11 @@
+import Foundation
+
+public protocol CexQRDecodable: QRDecodable {}
+
+public struct CexQRInfo: QRInfo, Equatable {
+    public let address: String
+
+    public init(address: String) {
+        self.address = address
+    }
+}
diff --git a/FearlessUtils/Classes/QR/CexQRDecoder.swift b/FearlessUtils/Classes/QR/CexQRDecoder.swift
@@ -0,0 +1,14 @@
+import Foundation
+
+public class CexQRDecoder: CexQRDecodable {
+
+    public init() {}
+
+    public func decode(data: Data) throws -> QRInfo {
+        guard let address = String(data: data, encoding: .utf8) else {
+            throw QRDecoderError.brokenFormat
+        }
+
+        return CexQRInfo(address: address)
+    }
+}
diff --git a/FearlessUtils/Classes/QR/QRCommon.swift b/FearlessUtils/Classes/QR/QRCommon.swift
@@ -0,0 +1,25 @@
+import Foundation
+
+public protocol QRInfo {
+    var address: String { get }
+}
+
+public protocol QRDecodable {
+    func decode(data: Data) throws -> QRInfo
+}
+
+public protocol QREncodable {
+    func encode(info: SubstrateQRInfo) throws -> Data
+}
+
+public enum QREncoderError: Error, Equatable {
+    case brokenData
+}
+
+public enum QRDecoderError: Error, Equatable {
+    case brokenFormat
+    case unexpectedNumberOfFields
+    case undefinedPrefix
+    case accountIdMismatch
+    case wrongDecoder
+}
diff --git a/FearlessUtils/Classes/QR/SubstrateQRCommon.swift b/FearlessUtils/Classes/QR/SubstrateQRCommon.swift
@@ -1,41 +1,27 @@
 import Foundation
 
-public struct SubstrateQRInfo: Equatable {
+public protocol SubstrateQREncodable: QREncodable {}
+public protocol SubstrateQRDecodable: QRDecodable {}
+
+public struct SubstrateQRInfo: QRInfo, Equatable {
     public let prefix: String
     public let address: String
     public let rawPublicKey: Data
     public let username: String?
-
-    public init(prefix: String = SubstrateQR.prefix,
-                address: String,
-                rawPublicKey: Data,
-                username: String?) {
+
+    public init(
+        prefix: String = SubstrateQR.prefix,
+        address: String,
+        rawPublicKey: Data,
+        username: String?
+    ) {
         self.prefix = prefix
         self.address = address
         self.rawPublicKey = rawPublicKey
         self.username = username
     }
 }
 
-public protocol SubstrateQREncodable {
-    func encode(info: SubstrateQRInfo) throws -> Data
-}
-
-public protocol SubstrateQRDecodable {
-    func decode(data: Data) throws -> SubstrateQRInfo
-}
-
-public enum SubstrateQREncoderError: Error, Equatable {
-    case brokenData
-}
-
-public enum SubstrateQRDecoderError: Error, Equatable {
-    case brokenFormat
-    case unexpectedNumberOfFields
-    case undefinedPrefix
-    case accountIdMismatch
-}
-
 public struct SubstrateQR {
     public static let prefix: String = "substrate"
     public static let fieldsSeparator: String = ":"

diff --git a/FearlessUtils/Classes/QR/SubstrateQRDecoder.swift b/FearlessUtils/Classes/QR/SubstrateQRDecoder.swift
@@ -16,26 +16,26 @@ open class SubstrateQRDecoder: SubstrateQRDecodable {
         self.separator = separator
     }
 
-    public func decode(data: Data) throws -> SubstrateQRInfo {
+    public func decode(data: Data) throws -> QRInfo {
         guard let fields = String(data: data, encoding: .utf8)?
             .components(separatedBy: separator) else {
-            throw SubstrateQRDecoderError.brokenFormat
+            throw QRDecoderError.brokenFormat
         }
 
         guard fields.count >= 3, fields.count <= 4 else {
-            throw SubstrateQRDecoderError.unexpectedNumberOfFields
+            throw QRDecoderError.unexpectedNumberOfFields
         }
 
         guard fields[0] == prefix else {
-            throw SubstrateQRDecoderError.undefinedPrefix
+            throw QRDecoderError.undefinedPrefix
         }
 
         let address = fields[1]
         let accountId = try addressFactory.accountId(fromAddress: address, type: chainType)
         let publicKey = try Data(hexString: fields[2])
 
         guard publicKey.matchPublicKeyToAccountId(accountId) else {
-            throw SubstrateQRDecoderError.accountIdMismatch
+            throw QRDecoderError.accountIdMismatch
         }
 
         let username = fields.count > 3 ? fields[3] : nil

diff --git a/FearlessUtils/Classes/QR/SubstrateQREncoder.swift b/FearlessUtils/Classes/QR/SubstrateQREncoder.swift
@@ -20,7 +20,7 @@ open class SubstrateQREncoder: SubstrateQREncodable {
         }
 
         guard let data = fields.joined(separator: separator).data(using: .utf8) else {
-            throw SubstrateQREncoderError.brokenData
+            throw QREncoderError.brokenData
         }
 
         return data