Update formatting

kolyasev · Jul 11, 2022 · 33e03c9 · 33e03c9
1 parent a997ffa
commit 33e03c9
Show file tree

Hide file tree

Showing 22 changed files with 171 additions and 270 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -0,0 +1,7 @@
+included:
+  - Sources
+  - Tests
+
+disabled_rules:
+  - identifier_name
+  - todo
diff --git a/Sources/Libraries/Atomic/Atomic.swift b/Sources/Libraries/Atomic/Atomic.swift
@@ -33,7 +33,6 @@ public final class Atomic<Value> {
         _value = value
     }
 
-
     /// Atomically replaces the contents of the variable.
     ///
     /// Returns the old value.

diff --git a/Sources/SwiftJSONRPC/Client/RPCClient.swift b/Sources/SwiftJSONRPC/Client/RPCClient.swift
@@ -12,7 +12,7 @@ open class RPCClient {
 
     // MARK: - Properties
 
-    public var requestRetrier: RequestRetrier? = nil
+    public var requestRetrier: RequestRetrier?
 
     public var coder = Coder()
 

diff --git a/Sources/SwiftJSONRPC/Client/Retrier/RequestRetrier.swift b/Sources/SwiftJSONRPC/Client/Retrier/RequestRetrier.swift
@@ -6,12 +6,10 @@
 //
 // ----------------------------------------------------------------------------
 
-public protocol RequestRetrier
-{
-// MARK: - Functions
+public protocol RequestRetrier {
+
+    // MARK: - Functions
 
     func should(client: RPCClient, retryRequest request: Request, afterResponse response: Response) -> Bool
 
 }
-
-// ----------------------------------------------------------------------------
diff --git a/Sources/SwiftJSONRPC/Coder/Coder.swift b/Sources/SwiftJSONRPC/Coder/Coder.swift
@@ -40,7 +40,7 @@ public struct Coder {
 
     func decode<Result: InvocationResult>(_ type: Result.Type, from result: Response.Result) throws -> Result {
         guard Result.self != VoidInvocationResult.self else {
-            return VoidInvocationResult() as! Result
+            return VoidInvocationResult() as! Result // swiftlint:disable:this force_cast
         }
         do {
             let data = try JSONSerialization.data(withJSONObject: result, options: .fragmentsAllowed)

diff --git a/Sources/SwiftJSONRPC/Error/InvocationError.swift b/Sources/SwiftJSONRPC/Error/InvocationError.swift
@@ -6,12 +6,8 @@
 //
 // ----------------------------------------------------------------------------
 
-public enum InvocationError: Error
-{
+public enum InvocationError: Error {
     case applicationError(cause: Error)
     case rpcError(error: RPCError)
     case canceled
 }
-
-// ----------------------------------------------------------------------------
-
diff --git a/Sources/SwiftJSONRPC/Error/RPCError.swift b/Sources/SwiftJSONRPC/Error/RPCError.swift
@@ -6,33 +6,28 @@
 //
 // ----------------------------------------------------------------------------
 
-public struct RPCError: Error
-{
-// MARK: - Construction
+public struct RPCError: Error {
 
-    init(code: Int, message: String, data: Any?)
-    {
-        // Init instance variables
-        self.code = code
-        self.message = message
-        self.data = data
-    }
+    // MARK: - Properties
 
-// MARK: - Properties
+        public let code: Int
 
-    public let code: Int
+        public let message: String
 
-    public let message: String
+        public let data: Any?
 
-    public let data: Any?
+    // MARK: - Initialization
 
+    init(code: Int, message: String, data: Any?) {
+        self.code = code
+        self.message = message
+        self.data = data
+    }
 }
 
-// ----------------------------------------------------------------------------
+extension RPCError {
 
-extension RPCError
-{
-// MARK: - Constants
+    // MARK: - Constants
 
     /// Invalid JSON was received by the server.
     /// An error occurred on the server while parsing the JSON text.
@@ -51,6 +46,3 @@ extension RPCError
     public static let internalError = RPCError(code: -32603, message: "Internal error", data: nil)
 
 }
-
-// ----------------------------------------------------------------------------
-
diff --git a/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Adapter/DefaultHTTPRequestAdapter.swift b/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Adapter/DefaultHTTPRequestAdapter.swift
@@ -6,18 +6,15 @@
 //
 // ----------------------------------------------------------------------------
 
-open class DefaultHTTPRequestAdapter: HTTPRequestAdapter
-{
-// MARK: - Construction
+open class DefaultHTTPRequestAdapter: HTTPRequestAdapter {
+
+    // MARK: - Initialization
 
     public init() { }
 
-// MARK: - Functions
+    // MARK: - Functions
 
     open func adapt(request: HTTPRequest) -> HTTPRequest {
         return request
     }
-
 }
-
-// ----------------------------------------------------------------------------
diff --git a/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Adapter/DefaultHTTPResponseAdapter.swift b/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Adapter/DefaultHTTPResponseAdapter.swift
@@ -6,23 +6,19 @@
 //
 // ----------------------------------------------------------------------------
 
-open class DefaultHTTPResponseAdapter: HTTPResponseAdapter
-{
-// MARK: - Construction
+open class DefaultHTTPResponseAdapter: HTTPResponseAdapter {
+
+    // MARK: - Initialization
 
     public init() { }
 
-// MARK: - Functions
+    // MARK: - Functions
 
-    open func adapt(response: HTTPResponse, forRequest request: HTTPRequest) throws -> HTTPResponse
-    {
+    open func adapt(response: HTTPResponse, forRequest request: HTTPRequest) throws -> HTTPResponse {
         guard (200..<300).contains(response.code) else {
             throw HTTPResponseStatusCodeError(cause: nil)
         }
 
         return response
     }
-
 }
-
-// ----------------------------------------------------------------------------
diff --git a/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Adapter/HTTPRequestAdapter.swift b/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Adapter/HTTPRequestAdapter.swift
@@ -6,12 +6,10 @@
 //
 // ----------------------------------------------------------------------------
 
-public protocol HTTPRequestAdapter
-{
-// MARK: - Functions
+public protocol HTTPRequestAdapter {
+
+    // MARK: - Functions
 
     func adapt(request: HTTPRequest) throws -> HTTPRequest
 
 }
-
-// ----------------------------------------------------------------------------
diff --git a/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Adapter/HTTPResponseAdapter.swift b/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Adapter/HTTPResponseAdapter.swift
@@ -6,12 +6,10 @@
 //
 // ----------------------------------------------------------------------------
 
-public protocol HTTPResponseAdapter
-{
-// MARK: - Functions
+public protocol HTTPResponseAdapter {
+
+    // MARK: - Functions
 
     func adapt(response: HTTPResponse, forRequest request: HTTPRequest) throws -> HTTPResponse
 
 }
-
-// ----------------------------------------------------------------------------
diff --git a/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Client/HTTPRequest.swift b/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Client/HTTPRequest.swift
@@ -26,7 +26,7 @@ extension HTTPRequest: Equatable {
 
     // MARK: - Functions
 
-    public static func ==(lhs: HTTPRequest, rhs: HTTPRequest) -> Bool {
+    public static func == (lhs: HTTPRequest, rhs: HTTPRequest) -> Bool {
         return lhs.method == rhs.method &&
                lhs.url == rhs.url &&
                lhs.headers == rhs.headers &&

diff --git a/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Client/HTTPResponse.swift b/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Client/HTTPResponse.swift
@@ -8,11 +8,9 @@
 
 import Foundation
 
-// ----------------------------------------------------------------------------
+public struct HTTPResponse {
 
-public struct HTTPResponse
-{
-// MARK: - Properties
+    // MARK: - Properties
 
     public var url: URL
 
@@ -23,5 +21,3 @@ public struct HTTPResponse
     public var body: Data
 
 }
-
-// ----------------------------------------------------------------------------
diff --git a/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Client/URLSessionHTTPClient.swift b/Sources/SwiftJSONRPC/RequestExecutor/HTTP/Client/URLSessionHTTPClient.swift
@@ -65,7 +65,7 @@ struct URLSessionHTTPClient: HTTPClient {
 
 }
 
-extension HTTPRequest  {
+extension HTTPRequest {
 
     // MARK: - Functions
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,6 @@ public final class Atomic<Value> { @@
             _value = value
         }
         /// Atomically replaces the contents of the variable.
         ///
         /// Returns the old value.
@@ Expand Down @@