build: fix all swiftlint errors

goncalo-frade-iohk · goncalo-frade-iohk · commit 6bc3b461ac51 · 2022-12-05T16:15:15.000Z
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -71,14 +71,16 @@ opt_in_rules:
   - xct_specific_matcher
   - yoda_condition
 excluded:
+  - .git
+  - .swiftpm
   - .build
   - build
   - Pods
   - protobuf
   - PrismAPISDK
-  - Sources/PrismSwiftSDK/protobuf
+  - Sources/PrismSwiftSDK/protobuf/*
   - Tests/PrismSwiftSDKTests
-  - Castor/Sources/DIDParser/DIDGrammar
+  - Castor/Sources/DIDParser/DIDGrammar/*
   - Castor/Tests
   - Castor/Sources/protobuf
   - Apollo/Tests
@@ -90,6 +92,7 @@ excluded:
   - Pluto/Tests
   - Pollux/Tests
   - PrismAgent/Tests
+  - Mercury/Sources/TestingConstants/*
   - Sample
 line_length:
   ignores_comments: true
@@ -121,4 +124,5 @@ identifier_name:
   excluded:
     - id
     - ec
+    - to
 reporter: "xcode"
diff --git a/Castor/Sources/CastorImpl+Public.swift b/Castor/Sources/CastorImpl+Public.swift
@@ -36,7 +36,11 @@ extension CastorImpl: Castor {
     }
 
     public func resolveDID(did: DID) async throws -> DIDDocument {
-        guard let document = try await resolvers.first?.resolve(did: did) else { throw CastorError.notPossibleToResolveDID }
+        guard
+            let document = try await resolvers
+                .first?
+                .resolve(did: did)
+        else { throw CastorError.notPossibleToResolveDID }
         return document
     }
 }
diff --git a/Core/Sources/Helpers/JSONDecoder+Helper.swift b/Core/Sources/Helpers/JSONDecoder+Helper.swift
@@ -2,7 +2,7 @@ import Foundation
 
 public extension JSONDecoder {
     static func didComm() -> JSONDecoder {
-        var decoder = JSONDecoder()
+        let decoder = JSONDecoder()
         decoder.dataDecodingStrategy = .deferredToData
         decoder.keyDecodingStrategy = .convertFromSnakeCase
         return decoder
diff --git a/Core/Sources/Helpers/JSONEncoder+Helper.swift b/Core/Sources/Helpers/JSONEncoder+Helper.swift
@@ -2,7 +2,7 @@ import Foundation
 
 public extension JSONEncoder {
     static func didComm() -> JSONEncoder {
-        var encoder = JSONEncoder()
+        let encoder = JSONEncoder()
         encoder.dataEncodingStrategy = .deferredToData
         encoder.keyEncodingStrategy = .convertToSnakeCase
         encoder.outputFormatting = .prettyPrinted
diff --git a/Domain/Sources/BBs/Mercury.swift b/Domain/Sources/BBs/Mercury.swift
@@ -7,8 +7,8 @@ public protocol Mercury {
     func sendMessage(msg: Message) async throws -> Data?
 }
 
-extension Mercury {
-    public func sendMessage(msg: Message) async throws -> Message? {
+public extension Mercury {
+    func sendMessage(msg: Message) async throws -> Message? {
         guard
             let msgData = try await sendMessage(msg: msg),
             let msgStr = String(data: msgData, encoding: .utf8)
diff --git a/Domain/Sources/Models/Message.swift b/Domain/Sources/Models/Message.swift
@@ -4,9 +4,7 @@ public struct Message {
     public let id: String
     public let piuri: String
     public let from: DID?
-    // swiftlint:disable identifier_name
     public let to: DID?
-    // swiftlint:enable identifier_name
     public let fromPrior: String?
     public let body: Data
     public let extraHeaders: [String: String]
@@ -21,9 +19,7 @@ public struct Message {
         id: String = UUID().uuidString,
         piuri: String,
         from: DID? = nil,
-        // swiftlint:disable identifier_name
         to: DID? = nil,
-        // swiftlint:enable identifier_name
         fromPrior: String? = nil,
         body: Data,
         extraHeaders: [String : String] = [:],
diff --git a/Pluto/Sources/Helpers/Message+Codable.swift b/Pluto/Sources/Helpers/Message+Codable.swift
@@ -17,7 +17,7 @@ extension Message: Codable {
         case ack
         case body
     }
-    
+
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(id, forKey: .id)
diff --git a/Pluto/Sources/PersistentStorage/DAO/CDDIDPrivateKeyDAO+DIDPrivateKeyProvider.swift b/Pluto/Sources/PersistentStorage/DAO/CDDIDPrivateKeyDAO+DIDPrivateKeyProvider.swift
@@ -14,15 +14,15 @@ extension CDDIDPrivateKeyDAO: DIDPrivateKeyProvider {
     func getDIDInfo(did: DID) -> AnyPublisher<(did: DID, privateKey: PrivateKey)?, Error> {
         fetchByIDsPublisher(did.string, context: readContext)
             .map {
-                $0.map { (DID(from: $0), PrivateKey(curve: $0.curve, value: $0.privateKey))}
-            }
+                $0.map { (DID(from: $0), PrivateKey(curve: $0.curve, value: $0.privateKey))
+            }}
             .eraseToAnyPublisher()
     }
     func getPrivateKey(did: DID) -> AnyPublisher<PrivateKey?, Error> {
         fetchByIDsPublisher(did.string, context: readContext)
             .map { did in
-                did.map { PrivateKey(curve: $0.curve, value: $0.privateKey) }
-            }
+                did.map { PrivateKey(curve: $0.curve, value: $0.privateKey)
+            }}
             .eraseToAnyPublisher()
     }
 }
diff --git a/Pluto/Sources/PersistentStorage/DAO/CDMediatorDIDDAO+MediatorStore.swift b/Pluto/Sources/PersistentStorage/DAO/CDMediatorDIDDAO+MediatorStore.swift
@@ -22,7 +22,7 @@ extension CDMediatorDIDDAO: MediatorStore {
                     .eraseToAnyPublisher()
             }
             .flatMap { peerDID, routingDID, mediatorDID  in
-                updateOrCreate(peer.string, context: writeContext) { cdobj, context in
+                updateOrCreate(peer.string, context: writeContext) { cdobj, _ in
                     cdobj.parseFrom(peerDID: peerDID, routingDID: routingDID, mediatorDID: mediatorDID)
                 }
             }
diff --git a/Pluto/Sources/PersistentStorage/DAO/CDMessageDAO+MessageProvider.swift b/Pluto/Sources/PersistentStorage/DAO/CDMessageDAO+MessageProvider.swift
@@ -5,7 +5,7 @@ import Domain
 extension CDMessageDAO: MessageProvider {
     func getAll() -> AnyPublisher<[Message], Error> {
         fetchController(context: readContext)
-            .tryMap { try $0.map { try $0.toDomain() }}
+            .tryMap { try $0.map { try $0.toDomain() } }
             .eraseToAnyPublisher()
     }
 
@@ -14,7 +14,7 @@ extension CDMessageDAO: MessageProvider {
             predicate: NSPredicate(format: "(pair.did == %@) OR (pair.holderDID.did == %@)", did.string, did.string),
             context: readContext
         )
-        .tryMap { try $0.map { try $0.toDomain() }}
+        .tryMap { try $0.map { try $0.toDomain() } }
         .eraseToAnyPublisher()
     }
 
@@ -23,7 +23,7 @@ extension CDMessageDAO: MessageProvider {
             predicate: NSPredicate(format: "to == %@", did.string),
             context: readContext
         )
-        .tryMap { try $0.map { try $0.toDomain() }}
+        .tryMap { try $0.map { try $0.toDomain() } }
         .eraseToAnyPublisher()
     }
 
@@ -32,7 +32,7 @@ extension CDMessageDAO: MessageProvider {
             predicate: NSPredicate(format: "from == %@", did.string),
             context: readContext
         )
-        .tryMap { try $0.map { try $0.toDomain() }}
+        .tryMap { try $0.map { try $0.toDomain() } }
         .eraseToAnyPublisher()
     }
 
@@ -41,7 +41,7 @@ extension CDMessageDAO: MessageProvider {
             predicate: NSPredicate(format: "type == %@", type),
             context: readContext
         )
-        .tryMap { try $0.map { try $0.toDomain() }}
+        .tryMap { try $0.map { try $0.toDomain() } }
         .eraseToAnyPublisher()
     }
 
@@ -50,7 +50,7 @@ extension CDMessageDAO: MessageProvider {
             predicate: NSPredicate(format: "(from == %@) OR (to == %@)", from.string, to.string),
             context: readContext
         )
-        .tryMap { try $0.map { try $0.toDomain() }}
+        .tryMap { try $0.map { try $0.toDomain() } }
         .eraseToAnyPublisher()
     }
 
@@ -62,7 +62,6 @@ extension CDMessageDAO: MessageProvider {
 }
 
 private extension CDMessage {
-
     func toDomain() throws -> Message {
         return try JSONDecoder().decode(Message.self, from: dataJson)
     }
diff --git a/Pluto/Sources/PersistentStorage/DAO/CDMessageDAO+MessageStore.swift b/Pluto/Sources/PersistentStorage/DAO/CDMessageDAO+MessageStore.swift
@@ -52,7 +52,6 @@ extension CDMessageDAO: MessageStore {
 }
 
 private extension CDMessage {
-
     func fromDomain(msg: Message, pair: CDDIDPair?) throws {
         self.messageId = msg.id
         self.from = msg.from?.string
diff --git a/Pluto/Sources/PersistentStorage/Models/CDDID+CoreDataClass.swift b/Pluto/Sources/PersistentStorage/Models/CDDID+CoreDataClass.swift
@@ -1,5 +1,5 @@
-import Domain
 import CoreData
+import Domain
 import Foundation
 
 @objc(CDDID)
diff --git a/Pollux/Sources/PolluxImpl.swift b/Pollux/Sources/PolluxImpl.swift
@@ -1,7 +1,6 @@
 import Domain
 
 public struct PolluxImpl {
-
     let castor: Castor
 
     init(castor: Castor) {
diff --git a/PrismAgent/Sources/PrismAgent.swift b/PrismAgent/Sources/PrismAgent.swift
@@ -4,13 +4,13 @@ import Domain
 import Foundation
 
 public class PrismAgent {
-
     public enum State {
         case stoped
         case starting
         case running
         case stoping
     }
+
     public enum DIDType {
         case prism
         case peer
diff --git a/PrismAgent/Sources/Protocols/Connection/HandshakeRequest.swift b/PrismAgent/Sources/Protocols/Connection/HandshakeRequest.swift
@@ -22,9 +22,7 @@ struct HandshakeRequest {
     let type: String = ProtocolTypes.didcommconnectionRequest.rawValue
     let id: String
     let from: DID
-    // swiftlint:disable identifier_name
     let to: DID
-    // swiftlint:enable identifier_name
     let thid: String?
     let body: Body
 
@@ -37,9 +35,7 @@ struct HandshakeRequest {
     init(
         id: String = UUID().uuidString,
         from: DID,
-        // swiftlint:disable identifier_name
         to: DID,
-        // swiftlint:enable identifier_name
         thid: String?,
         body: Body
     ) {
diff --git a/PrismAgent/Sources/Protocols/IssueCredential/IssueCredential.swift b/PrismAgent/Sources/Protocols/IssueCredential/IssueCredential.swift
@@ -33,19 +33,15 @@ public struct IssueCredential {
     let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
-    // swiftlint:disable identifier_name
     public let to: DID
-    // swiftlint:enable identifier_name
 
     init(
         id: String = UUID().uuidString,
         body: Body,
         attachments: [AttachmentDescriptor],
         thid: String?,
         from: DID,
-        // swiftlint:disable identifier_name
         to: DID
-        // swiftlint:enable identifier_name
     ) {
         self.id = id
         self.body = body
diff --git a/PrismAgent/Sources/Protocols/IssueCredential/OfferCredential.swift b/PrismAgent/Sources/Protocols/IssueCredential/OfferCredential.swift
@@ -36,19 +36,15 @@ public struct OfferCredential {
     let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
-    // swiftlint:disable identifier_name
     public let to: DID
-    // swiftlint:enable identifier_name
 
     init(
         id: String = UUID().uuidString,
         body: Body,
         attachments: [AttachmentDescriptor],
         thid: String?,
         from: DID,
-        // swiftlint:disable identifier_name
         to: DID
-        // swiftlint:enable identifier_name
     ) {
         self.id = id
         self.body = body
diff --git a/PrismAgent/Sources/Protocols/IssueCredential/ProposeCredential.swift b/PrismAgent/Sources/Protocols/IssueCredential/ProposeCredential.swift
@@ -30,19 +30,15 @@ public struct ProposeCredential {
     let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
-    // swiftlint:disable identifier_name
     public let to: DID
-    // swiftlint:enable identifier_name
 
     init(
         id: String = UUID().uuidString,
         body: Body,
         attachments: [AttachmentDescriptor],
         thid: String?,
         from: DID,
-        // swiftlint:disable identifier_name
         to: DID
-        // swiftlint:enable identifier_name
     ) {
         self.id = id
         self.body = body
diff --git a/PrismAgent/Sources/Protocols/IssueCredential/RequestCredential.swift b/PrismAgent/Sources/Protocols/IssueCredential/RequestCredential.swift
@@ -27,19 +27,15 @@ public struct RequestCredential {
     let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
-    // swiftlint:disable identifier_name
     public let to: DID
-    // swiftlint:enable identifier_name
 
     init(
         id: String = UUID().uuidString,
         body: Body,
         attachments: [AttachmentDescriptor],
         thid: String?,
         from: DID,
-        // swiftlint:disable identifier_name
         to: DID
-        // swiftlint:enable identifier_name
     ) {
         self.id = id
         self.body = body
diff --git a/PrismAgent/Sources/Protocols/Mediation/MediationGrant.swift b/PrismAgent/Sources/Protocols/Mediation/MediationGrant.swift
@@ -9,9 +9,7 @@ struct MediationGrant {
     let id: String
     let type = ProtocolTypes.didcommMediationGrant.rawValue
     let from: DID
-    // swiftlint:disable identifier_name
     let to: DID
-    // swiftlint:enable identifier_name
     let body: Body
 
     init(
diff --git a/PrismAgent/Sources/Protocols/Mediation/MediationRequest.swift b/PrismAgent/Sources/Protocols/Mediation/MediationRequest.swift
@@ -5,9 +5,7 @@ struct MediationRequest {
     let id: String
     let type = ProtocolTypes.didcommMediationRequest.rawValue
     let from: DID
-    // swiftlint:disable identifier_name
     let to: DID
-    // swiftlint:enable identifier_name
 
     init(
         id: String = UUID().uuidString,
diff --git a/PrismAgent/Sources/Protocols/Pickup/PickupRequest.swift b/PrismAgent/Sources/Protocols/Pickup/PickupRequest.swift
@@ -17,9 +17,7 @@ struct PickUpRequest {
     }
 
     let from: DID
-    // swiftlint:disable identifier_name
     let to: DID
-    // swiftlint:enable identifier_name
     let body: Body
 
     func makeMessage() throws -> Message {
diff --git a/PrismAgent/Sources/Protocols/ProofPresentation/Presentation.swift b/PrismAgent/Sources/Protocols/ProofPresentation/Presentation.swift
@@ -32,19 +32,15 @@ public struct Presentation {
     let attachments: [AttachmentDescriptor]
     public let thid: String?
     public let from: DID
-    // swiftlint:disable identifier_name
     public let to: DID
-    // swiftlint:enable identifier_name
 
     init(
         id: String = UUID().uuidString,
         body: Body,
         attachments: [AttachmentDescriptor],
         thid: String?,
         from: DID,
-        // swiftlint:disable identifier_name
         to: DID
-        // swiftlint:enable identifier_name
     ) {
         self.id = id
         self.body = body
diff --git a/PrismAgent/Sources/Protocols/ProofPresentation/ProposePresentation.swift b/PrismAgent/Sources/Protocols/ProofPresentation/ProposePresentation.swift
diff --git a/PrismAgent/Sources/Protocols/ProofPresentation/RequestPresentation.swift b/PrismAgent/Sources/Protocols/ProofPresentation/RequestPresentation.swift

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,11 @@ extension CastorImpl: Castor {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public func resolveDID(did: DID) async throws -> DIDDocument {`
`39`		`- guard let document = try await resolvers.first?.resolve(did: did) else { throw CastorError.notPossibleToResolveDID }`
	`39`	`+ guard`
	`40`	`+ let document = try await resolvers`
	`41`	`+ .first?`
	`42`	`+ .resolve(did: did)`
	`43`	`+ else { throw CastorError.notPossibleToResolveDID }`
`40`	`44`	`return document`
`41`	`45`	`}`
`42`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ extension Message: Codable {`
`17`	`17`	`case ack`
`18`	`18`	`case body`
`19`	`19`	`}`
`20`		`-`
	`20`	`+`
`21`	`21`	`public func encode(to encoder: Encoder) throws {`
`22`	`22`	`var container = encoder.container(keyedBy: CodingKeys.self)`
`23`	`23`	`try container.encode(id, forKey: .id)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ extension CDMediatorDIDDAO: MediatorStore {`
`22`	`22`	`.eraseToAnyPublisher()`
`23`	`23`	`}`
`24`	`24`	`.flatMap { peerDID, routingDID, mediatorDID in`
`25`		`- updateOrCreate(peer.string, context: writeContext) { cdobj, context in`
	`25`	`+ updateOrCreate(peer.string, context: writeContext) { cdobj, _ in`
`26`	`26`	`cdobj.parseFrom(peerDID: peerDID, routingDID: routingDID, mediatorDID: mediatorDID)`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import Domain`
`5`	`5`	`extension CDMessageDAO: MessageProvider {`
`6`	`6`	`func getAll() -> AnyPublisher<[Message], Error> {`
`7`	`7`	`fetchController(context: readContext)`
`8`		`- .tryMap { try $0.map { try $0.toDomain() }}`
	`8`	`+ .tryMap { try $0.map { try $0.toDomain() } }`
`9`	`9`	`.eraseToAnyPublisher()`
`10`	`10`	`}`
`11`	`11`
`@@ -14,7 +14,7 @@ extension CDMessageDAO: MessageProvider {`
`14`	`14`	`predicate: NSPredicate(format: "(pair.did == %@) OR (pair.holderDID.did == %@)", did.string, did.string),`
`15`	`15`	`context: readContext`
`16`	`16`	`)`
`17`		`- .tryMap { try $0.map { try $0.toDomain() }}`
	`17`	`+ .tryMap { try $0.map { try $0.toDomain() } }`
`18`	`18`	`.eraseToAnyPublisher()`
`19`	`19`	`}`
`20`	`20`
`@@ -23,7 +23,7 @@ extension CDMessageDAO: MessageProvider {`
`23`	`23`	`predicate: NSPredicate(format: "to == %@", did.string),`
`24`	`24`	`context: readContext`
`25`	`25`	`)`
`26`		`- .tryMap { try $0.map { try $0.toDomain() }}`
	`26`	`+ .tryMap { try $0.map { try $0.toDomain() } }`
`27`	`27`	`.eraseToAnyPublisher()`
`28`	`28`	`}`
`29`	`29`
`@@ -32,7 +32,7 @@ extension CDMessageDAO: MessageProvider {`
`32`	`32`	`predicate: NSPredicate(format: "from == %@", did.string),`
`33`	`33`	`context: readContext`
`34`	`34`	`)`
`35`		`- .tryMap { try $0.map { try $0.toDomain() }}`
	`35`	`+ .tryMap { try $0.map { try $0.toDomain() } }`
`36`	`36`	`.eraseToAnyPublisher()`
`37`	`37`	`}`
`38`	`38`
`@@ -41,7 +41,7 @@ extension CDMessageDAO: MessageProvider {`
`41`	`41`	`predicate: NSPredicate(format: "type == %@", type),`
`42`	`42`	`context: readContext`
`43`	`43`	`)`
`44`		`- .tryMap { try $0.map { try $0.toDomain() }}`
	`44`	`+ .tryMap { try $0.map { try $0.toDomain() } }`
`45`	`45`	`.eraseToAnyPublisher()`
`46`	`46`	`}`
`47`	`47`
`@@ -50,7 +50,7 @@ extension CDMessageDAO: MessageProvider {`
`50`	`50`	`predicate: NSPredicate(format: "(from == %@) OR (to == %@)", from.string, to.string),`
`51`	`51`	`context: readContext`
`52`	`52`	`)`
`53`		`- .tryMap { try $0.map { try $0.toDomain() }}`
	`53`	`+ .tryMap { try $0.map { try $0.toDomain() } }`
`54`	`54`	`.eraseToAnyPublisher()`
`55`	`55`	`}`
`56`	`56`
`@@ -62,7 +62,6 @@ extension CDMessageDAO: MessageProvider {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`private extension CDMessage {`
`65`		`-`
`66`	`65`	`func toDomain() throws -> Message {`
`67`	`66`	`return try JSONDecoder().decode(Message.self, from: dataJson)`
`68`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ extension CDMessageDAO: MessageStore {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private extension CDMessage {`
`55`		`-`
`56`	`55`	`func fromDomain(msg: Message, pair: CDDIDPair?) throws {`
`57`	`56`	`self.messageId = msg.id`
`58`	`57`	`self.from = msg.from?.string`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,7 @@ struct PickUpRequest {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`let from: DID`
`20`		`- // swiftlint:disable identifier_name`
`21`	`20`	`let to: DID`
`22`		`- // swiftlint:enable identifier_name`
`23`	`21`	`let body: Body`
`24`	`22`
`25`	`23`	`func makeMessage() throws -> Message {`