Refactor

Tests/ElixxirDAppsSDKTests/Models/EventReportTests.swift

@@ -17,7 +17,6 @@ final class EventReportTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-
     let report = try EventReport.decode(jsonData)
 
     XCTAssertNoDifference(report, EventReport(

Tests/ElixxirDAppsSDKTests/Models/FactTests.swift

@@ -4,20 +4,19 @@ import XCTest
 
 final class FactTests: XCTestCase {
   func testCoding() throws {
-    let factString = "Zezima"
+    let factValue = "Zezima"
     let factType: Int = 0
     let jsonString = """
     {
-      "Fact": "\(factString)",
+      "Fact": "\(factValue)",
       "Type": \(factType)
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-
     let fact = try Fact.decode(jsonData)
 
     XCTAssertNoDifference(fact, Fact(
-      fact: factString,
+      fact: factValue,
       type: factType
     ))
 

Tests/ElixxirDAppsSDKTests/Models/FileSendTests.swift

@@ -17,7 +17,6 @@ final class FileSendTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-
     let fileSend = try FileSend.decode(jsonData)
 
     XCTAssertNoDifference(fileSend, FileSend(

Tests/ElixxirDAppsSDKTests/Models/MessageSendReportTests.swift

@@ -5,23 +5,21 @@ import XCTest
 final class MessageSendReportTests: XCTestCase {
   func testCoding() throws {
     let rounds = [1, 5, 9]
-    let messageIdString = "51Yy47uZbP0o2Y9B/kkreDLTB6opUol3M3mYiY2dcdQ="
+    let messageIdB64 = "51Yy47uZbP0o2Y9B/kkreDLTB6opUol3M3mYiY2dcdQ="
     let timestamp: Int = 1_653_582_683_183_384_000
-
     let jsonString = """
     {
       "Rounds": [\(rounds.map { "\($0)" }.joined(separator: ", "))],
-      "MessageID": "\(messageIdString)",
+      "MessageID": "\(messageIdB64)",
       "Timestamp": \(timestamp)
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-
     let report = try MessageSendReport.decode(jsonData)
 
     XCTAssertNoDifference(report, MessageSendReport(
       roundList: rounds,
-      messageId: Data(base64Encoded: messageIdString)!,
+      messageId: Data(base64Encoded: messageIdB64)!,
       timestamp: timestamp
     ))
 

Tests/ElixxirDAppsSDKTests/Models/MessageTests.swift

@@ -5,10 +5,10 @@ import XCTest
 final class MessageTests: XCTestCase {
   func testCoding() throws {
     let type: Int = 1
-    let idString = "EB/70R5HYEw5htZ4Hg9ondrn3+cAc/lH2G0mjQMja3w="
-    let payloadString = "7TzZKgNphT5UooNM7mDSwtVcIs8AIu4vMKm4ld6GSR8YX5GrHirixUBAejmsgdroRJyo06TkIVef7UM9FN8YfQ=="
-    let senderString = "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
-    let recipientIdString = "amFrZXh4MzYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
+    let idB64 = "EB/70R5HYEw5htZ4Hg9ondrn3+cAc/lH2G0mjQMja3w="
+    let payloadB64 = "7TzZKgNphT5UooNM7mDSwtVcIs8AIu4vMKm4ld6GSR8YX5GrHirixUBAejmsgdroRJyo06TkIVef7UM9FN8YfQ=="
+    let senderB64 = "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
+    let recipientIdB64 = "amFrZXh4MzYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
     let ephemeralId: Int = 17
     let timestamp: Int = 1_653_580_439_357_351_000
     let encrypted = false
@@ -16,10 +16,10 @@ final class MessageTests: XCTestCase {
     let jsonString = """
     {
       "MessageType": \(type),
-      "ID": "\(idString)",
-      "Payload": "\(payloadString)",
-      "Sender": "\(senderString)",
-      "RecipientID": "\(recipientIdString)",
+      "ID": "\(idB64)",
+      "Payload": "\(payloadB64)",
+      "Sender": "\(senderB64)",
+      "RecipientID": "\(recipientIdB64)",
       "EphemeralID": \(ephemeralId),
       "Timestamp": \(timestamp),
       "Encrypted": \(encrypted),
@@ -27,15 +27,14 @@ final class MessageTests: XCTestCase {
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-
     let message = try Message.decode(jsonData)
 
     XCTAssertNoDifference(message, Message(
       messageType: 1,
-      id: Data(base64Encoded: idString)!,
-      payload: Data(base64Encoded: payloadString)!,
-      sender: Data(base64Encoded: senderString)!,
-      recipientId: Data(base64Encoded: recipientIdString)!,
+      id: Data(base64Encoded: idB64)!,
+      payload: Data(base64Encoded: payloadB64)!,
+      sender: Data(base64Encoded: senderB64)!,
+      recipientId: Data(base64Encoded: recipientIdB64)!,
       ephemeralId: ephemeralId,
       timestamp: timestamp,
       encrypted: encrypted,

Tests/ElixxirDAppsSDKTests/Models/ReceptionIdentityTests.swift

@@ -4,27 +4,26 @@ import XCTest
 
 final class ReceptionIdentityTests: XCTestCase {
   func testCoding() throws {
-    let idString = "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
-    let rsaPrivatePemString = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBNU15dTdhYjBJOS9UL1BFUUxtd2x3ejZHV3FjMUNYemVIVXhoVEc4bmg1WWRWSXMxCmJ2THpBVjNOMDJxdXN6K2s4TVFEWjBtejMzdkswUmhPczZIY0NUSFdzTEpXRkE5WWpzWWlCRi9qTDd1bmd1ckIKL2tvK1JJSnNrWGFWaEZaazRGdERoRXhTNWY4RnR0Qmk1NmNLZmdJQlVKT3ozZi9qQllTMkxzMlJ6cWV5YXM3SApjV2RaME9TclBTT3BiYlViU1FPbS9LWnlweGZHU21yZ2oxRUZuU1dZZ2xGZTdUOTRPbHF5MG14QTV5clVXbHorCk9sK3hHbXpCNUp4WUFSMU9oMFQrQTk4RWMrTUZHNm43L1MraDdzRDgybGRnVnJmbStFTzRCdmFKeTRESGZGMWgKNnp6QnVnY25NUVFGc0dLeDFYWC9COTVMdUpPVjdyeXlDbzZGbHdJREFRQUJBb0lCQVFDaUh6OGNlcDZvQk9RTAphUzBVRitHeU5VMnlVcVRNTWtTWThoUkh1c09CMmFheXoybHZVb3RLUHBPbjZRSWRWVTJrcE4vY2dtY0lSb2x5CkhBMDRUOHJBWVNaRlVqaVlRajkzKzRFREpJYXd2Z0YyVEs1bFoyb3oxVTdreStncU82V0RMR2Z0Q0wvODVQWEIKa210aXhnUXpRV3g1RWcvemtHdm03eURBalQxeDloNytsRjJwNFlBam5kT2xTS0dmQjFZeTR1RXBQd0kwc1lWdgpKQWc0MEFxbllZUmt4emJPbmQxWGNjdEJFN2Z1VDdrWXhoeSs3WXYrUTJwVy9BYmh6NGlHOEY1MW9GMGZwV0czCmlISDhsVXZFTkp2SUZEVHZ0UEpESlFZalBRN3lUbGlGZUdrMXZUQkcyQkpQNExzVzhpbDZOeUFuRktaY1hOQ24KeHVCendiSlJBb0dCQVBUK0dGTVJGRHRHZVl6NmwzZmg3UjJ0MlhrMysvUmpvR3BDUWREWDhYNERqR1pVd1RGVQpOS2tQTTNjS29ia2RBYlBDb3FpL0tOOVBibk9QVlZ3R3JkSE9vSnNibFVHYmJGamFTUzJQMFZnNUVhTC9rT2dUCmxMMUdoVFpIUWk1VUlMM0p4M1Z3T0ZRQ3RQOU1UQlQ0UEQvcEFLbDg3VTJXN3JTY1dGV1ZGbFNkQW9HQkFPOFUKVmhHWkRpVGFKTWVtSGZIdVYrNmtzaUlsam9aUVVzeGpmTGNMZ2NjV2RmTHBqS0ZWTzJNN3NqcEJEZ0w4NmFnegorVk14ZkQzZ1l0SmNWN01aMVcwNlZ6TlNVTHh3a1dRY1hXUWdDaXc5elpyYlhCUmZRNUVjMFBlblVoWWVwVzF5CkpkTC8rSlpQeDJxSzVrQytiWU5EdmxlNWdpcjlDSGVzTlR5enVyckRBb0dCQUl0cTJnN1RaazhCSVFUUVNrZ24Kb3BkRUtzRW4wZExXcXlBdENtVTlyaWpHL2l2eHlXczMveXZDQWNpWm5VVEp0QUZISHVlbXVTeXplQ2g5QmRkegoyWkRPNUdqQVBxVHlQS3NudFlNZkY4UDczZ1NES1VSWWVFbHFDejdET0c5QzRzcitPK3FoN1B3cCtqUmFoK1ZiCkNuWllNMDlBVDQ3YStJYUJmbWRkaXpLbEFvR0JBSmo1dkRDNmJIQnNISWlhNUNJL1RZaG5YWXUzMkVCYytQM0sKMHF3VThzOCtzZTNpUHBla2Y4RjVHd3RuUU4zc2tsMk1GQWFGYldmeVFZazBpUEVTb0p1cGJzNXA1enNNRkJ1bwpncUZrVnQ0RUZhRDJweTVwM2tQbDJsZjhlZXVwWkZScGE0WmRQdVIrMjZ4eWYrNEJhdlZJeld3NFNPL1V4Q3crCnhqbTNEczRkQW9HQWREL0VOa1BjU004c1BCM3JSWW9MQ2twcUV2U0MzbVZSbjNJd3c1WFAwcDRRVndhRmR1ckMKYUhtSE1EekNrNEUvb0haQVhFdGZ2S2tRaUI4MXVYM2c1aVo4amdYUVhXUHRteTVIcVVhcWJYUTlENkxWc3B0egpKL3R4SWJLMXp5c1o2bk9IY1VoUUwyVVF6SlBBRThZNDdjYzVzTThEN3kwZjJ0QURTQUZNMmN3PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQ=="
-    let saltString = "4kk02v0NIcGtlobZ/xkxqWz8uH/ams/gjvQm14QT0dI="
-    let dhKeyPrivateString = "eyJWYWx1ZSI6NDU2MDgzOTEzMjA0OTIyODA5Njg2MDI3MzQ0MzM3OTA0MzAyODYwMjM2NDk2NDM5NDI4NTcxMTMwNDMzOTQwMzgyMTIyMjY4OTQzNTMyMjIyMzc1MTkzNTEzMjU4MjA4MDA0NTczMDY4MjEwNzg2NDI5NjA1MjA0OTA3MjI2ODI5OTc3NTczMDkxODY0NTY3NDExMDExNjQxNCwiRmluZ2VycHJpbnQiOjE2ODAxNTQxNTExMjMzMDk4MzYzfQ=="
+    let idB64 = "emV6aW1hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD"
+    let rsaPrivatePemB64 = "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBNU15dTdhYjBJOS9UL1BFUUxtd2x3ejZHV3FjMUNYemVIVXhoVEc4bmg1WWRWSXMxCmJ2THpBVjNOMDJxdXN6K2s4TVFEWjBtejMzdkswUmhPczZIY0NUSFdzTEpXRkE5WWpzWWlCRi9qTDd1bmd1ckIKL2tvK1JJSnNrWGFWaEZaazRGdERoRXhTNWY4RnR0Qmk1NmNLZmdJQlVKT3ozZi9qQllTMkxzMlJ6cWV5YXM3SApjV2RaME9TclBTT3BiYlViU1FPbS9LWnlweGZHU21yZ2oxRUZuU1dZZ2xGZTdUOTRPbHF5MG14QTV5clVXbHorCk9sK3hHbXpCNUp4WUFSMU9oMFQrQTk4RWMrTUZHNm43L1MraDdzRDgybGRnVnJmbStFTzRCdmFKeTRESGZGMWgKNnp6QnVnY25NUVFGc0dLeDFYWC9COTVMdUpPVjdyeXlDbzZGbHdJREFRQUJBb0lCQVFDaUh6OGNlcDZvQk9RTAphUzBVRitHeU5VMnlVcVRNTWtTWThoUkh1c09CMmFheXoybHZVb3RLUHBPbjZRSWRWVTJrcE4vY2dtY0lSb2x5CkhBMDRUOHJBWVNaRlVqaVlRajkzKzRFREpJYXd2Z0YyVEs1bFoyb3oxVTdreStncU82V0RMR2Z0Q0wvODVQWEIKa210aXhnUXpRV3g1RWcvemtHdm03eURBalQxeDloNytsRjJwNFlBam5kT2xTS0dmQjFZeTR1RXBQd0kwc1lWdgpKQWc0MEFxbllZUmt4emJPbmQxWGNjdEJFN2Z1VDdrWXhoeSs3WXYrUTJwVy9BYmh6NGlHOEY1MW9GMGZwV0czCmlISDhsVXZFTkp2SUZEVHZ0UEpESlFZalBRN3lUbGlGZUdrMXZUQkcyQkpQNExzVzhpbDZOeUFuRktaY1hOQ24KeHVCendiSlJBb0dCQVBUK0dGTVJGRHRHZVl6NmwzZmg3UjJ0MlhrMysvUmpvR3BDUWREWDhYNERqR1pVd1RGVQpOS2tQTTNjS29ia2RBYlBDb3FpL0tOOVBibk9QVlZ3R3JkSE9vSnNibFVHYmJGamFTUzJQMFZnNUVhTC9rT2dUCmxMMUdoVFpIUWk1VUlMM0p4M1Z3T0ZRQ3RQOU1UQlQ0UEQvcEFLbDg3VTJXN3JTY1dGV1ZGbFNkQW9HQkFPOFUKVmhHWkRpVGFKTWVtSGZIdVYrNmtzaUlsam9aUVVzeGpmTGNMZ2NjV2RmTHBqS0ZWTzJNN3NqcEJEZ0w4NmFnegorVk14ZkQzZ1l0SmNWN01aMVcwNlZ6TlNVTHh3a1dRY1hXUWdDaXc5elpyYlhCUmZRNUVjMFBlblVoWWVwVzF5CkpkTC8rSlpQeDJxSzVrQytiWU5EdmxlNWdpcjlDSGVzTlR5enVyckRBb0dCQUl0cTJnN1RaazhCSVFUUVNrZ24Kb3BkRUtzRW4wZExXcXlBdENtVTlyaWpHL2l2eHlXczMveXZDQWNpWm5VVEp0QUZISHVlbXVTeXplQ2g5QmRkegoyWkRPNUdqQVBxVHlQS3NudFlNZkY4UDczZ1NES1VSWWVFbHFDejdET0c5QzRzcitPK3FoN1B3cCtqUmFoK1ZiCkNuWllNMDlBVDQ3YStJYUJmbWRkaXpLbEFvR0JBSmo1dkRDNmJIQnNISWlhNUNJL1RZaG5YWXUzMkVCYytQM0sKMHF3VThzOCtzZTNpUHBla2Y4RjVHd3RuUU4zc2tsMk1GQWFGYldmeVFZazBpUEVTb0p1cGJzNXA1enNNRkJ1bwpncUZrVnQ0RUZhRDJweTVwM2tQbDJsZjhlZXVwWkZScGE0WmRQdVIrMjZ4eWYrNEJhdlZJeld3NFNPL1V4Q3crCnhqbTNEczRkQW9HQWREL0VOa1BjU004c1BCM3JSWW9MQ2twcUV2U0MzbVZSbjNJd3c1WFAwcDRRVndhRmR1ckMKYUhtSE1EekNrNEUvb0haQVhFdGZ2S2tRaUI4MXVYM2c1aVo4amdYUVhXUHRteTVIcVVhcWJYUTlENkxWc3B0egpKL3R4SWJLMXp5c1o2bk9IY1VoUUwyVVF6SlBBRThZNDdjYzVzTThEN3kwZjJ0QURTQUZNMmN3PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQ=="
+    let saltB64 = "4kk02v0NIcGtlobZ/xkxqWz8uH/ams/gjvQm14QT0dI="
+    let dhKeyPrivateB64 = "eyJWYWx1ZSI6NDU2MDgzOTEzMjA0OTIyODA5Njg2MDI3MzQ0MzM3OTA0MzAyODYwMjM2NDk2NDM5NDI4NTcxMTMwNDMzOTQwMzgyMTIyMjY4OTQzNTMyMjIyMzc1MTkzNTEzMjU4MjA4MDA0NTczMDY4MjEwNzg2NDI5NjA1MjA0OTA3MjI2ODI5OTc3NTczMDkxODY0NTY3NDExMDExNjQxNCwiRmluZ2VycHJpbnQiOjE2ODAxNTQxNTExMjMzMDk4MzYzfQ=="
     let jsonString = """
     {
-      "ID": "\(idString)",
-      "RSAPrivatePem": "\(rsaPrivatePemString)",
-      "Salt": "\(saltString)",
-      "DHKeyPrivate": "\(dhKeyPrivateString)"
+      "ID": "\(idB64)",
+      "RSAPrivatePem": "\(rsaPrivatePemB64)",
+      "Salt": "\(saltB64)",
+      "DHKeyPrivate": "\(dhKeyPrivateB64)"
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-
     let identity = try ReceptionIdentity.decode(jsonData)
 
     XCTAssertNoDifference(identity, ReceptionIdentity(
-      id: Data(base64Encoded: idString)!,
-      rsaPrivatePem: Data(base64Encoded: rsaPrivatePemString)!,
-      salt: Data(base64Encoded: saltString)!,
-      dhKeyPrivate: Data(base64Encoded: dhKeyPrivateString)!
+      id: Data(base64Encoded: idB64)!,
+      rsaPrivatePem: Data(base64Encoded: rsaPrivatePemB64)!,
+      salt: Data(base64Encoded: saltB64)!,
+      dhKeyPrivate: Data(base64Encoded: dhKeyPrivateB64)!
     ))
 
     let encodedIdentity = try identity.encode()

Tests/ElixxirDAppsSDKTests/Models/RestlikeMessageTests.swift

@@ -5,29 +5,28 @@ import XCTest
 final class RestlikeMessageTests: XCTestCase {
   func testCoding() throws {
     let version: Int = 1
-    let headersString = "Y29udGVudHM6YXBwbGljYXRpb24vanNvbg=="
-    let contentString = "VGhpcyBpcyBhIHJlc3RsaWtlIG1lc3NhZ2U="
+    let headersB64 = "Y29udGVudHM6YXBwbGljYXRpb24vanNvbg=="
+    let contentB64 = "VGhpcyBpcyBhIHJlc3RsaWtlIG1lc3NhZ2U="
     let method: Int = 2
     let uri = "xx://CmixRestlike/rest"
     let error = ""
     let jsonString = """
     {
       "Version": \(version),
-      "Headers": "\(headersString)",
-      "Content": "\(contentString)",
+      "Headers": "\(headersB64)",
+      "Content": "\(contentB64)",
       "Method": \(method),
       "URI": "\(uri)",
       "Error": "\(error)"
     }
     """
     let jsonData = jsonString.data(using: .utf8)!
-
     let message = try RestlikeMessage.decode(jsonData)
 
     XCTAssertNoDifference(message, RestlikeMessage(
       version: version,
-      headers: Data(base64Encoded: headersString)!,
-      content: Data(base64Encoded: contentString)!,
+      headers: Data(base64Encoded: headersB64)!,
+      content: Data(base64Encoded: contentB64)!,
       method: method,
       uri: uri,
       error: error