Equatable and Hashable revision (#141)

* Removed supported 'Hashable' and 'Equatable' conformance implementation * ServerTrustEvaluator.PinningPolicy has custom Equatable conformance * Added Equatable to Route.Component.Key * Removed unnecessary `Equatable` conformance and placed manual `hashValue` on PinningPolicy * Reset changes on `ServerTrustEvaluator+Configuration.swift`
Mindera · Jun 1, 2018 · cf86fde · cf86fde
1 parent 2f0e93c
commit cf86fde
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 43 deletions.
diff --git a/Sources/DeepLinking/Route+Component.swift b/Sources/DeepLinking/Route+Component.swift
@@ -53,7 +53,7 @@ public extension Route {
 
         // MARK: Key
 
-        public enum Key {
+        public enum Key: Hashable {
             case empty
             case constant(String)
             case variable
@@ -124,27 +124,6 @@ extension Route.Component: CustomStringConvertible, CustomDebugStringConvertible
     }
 }
 
-extension Route.Component.Key: Hashable {
-
-    // MARK: Hashable
-
-    public var hashValue: Int {
-        switch self {
-        case .empty: return "\(type(of: self).empty)".hashValue
-        case let .constant(value): return value.hashValue
-        case .variable: return "\(type(of: self).variable)".hashValue
-        }
-    }
-
-    public static func == (lhs: Route.Component.Key, rhs: Route.Component.Key) -> Bool {
-        switch (lhs, rhs) {
-        case (.empty, .empty), (.variable, .variable): return true
-        case let (.constant(lhsString), .constant(rhsString)): return lhsString == rhsString
-        default: return false
-        }
-    }
-}
-
 extension Route.Component.Key: CustomStringConvertible, CustomDebugStringConvertible {
 
     // MARK: CustomStringConvertible

diff --git a/Tests/AlicerceTests/Network/JSONTests.swift b/Tests/AlicerceTests/Network/JSONTests.swift
@@ -1964,7 +1964,7 @@ class JSONTests: XCTestCase {
     }
 }
 
-private struct MockMappableObject {
+private struct MockMappableObject: Equatable {
     let keyA: String
     let keyB: Int
 }
@@ -1985,9 +1985,3 @@ extension MockMappableObject: Mappable {
         fatalError("💥 not implemented")
     }
 }
-
-extension MockMappableObject: Equatable {
-    static func == (lhs: MockMappableObject, rhs: MockMappableObject) -> Bool {
-        return lhs.keyA == rhs.keyA && lhs.keyB == rhs.keyB
-    }
-}
diff --git a/Tests/AlicerceTests/Network/MappableModel.swift b/Tests/AlicerceTests/Network/MappableModel.swift
@@ -9,7 +9,7 @@
 import Foundation
 @testable import Alicerce
 
-struct MappableModel {
+struct MappableModel: Equatable {
     let data: String
 }
 
@@ -30,9 +30,3 @@ extension MappableModel: Mappable {
         return ["data" : self.data]
     }
 }
-
-extension MappableModel: Equatable {
-    static func ==(lhs: MappableModel, rhs: MappableModel) -> Bool {
-        return lhs.data == lhs.data
-    }
-}
diff --git a/Tests/AlicerceTests/UIKit/MockReusableViewModelView.swift b/Tests/AlicerceTests/UIKit/MockReusableViewModelView.swift
@@ -10,12 +10,6 @@ import Foundation
 
 @testable import Alicerce
 
-struct MockReusableViewModelView {
+struct MockReusableViewModelView: Equatable {
     let testProperty = "😎"
 }
-
-extension MockReusableViewModelView: Equatable {
-    static func ==(lhs: MockReusableViewModelView, rhs: MockReusableViewModelView) -> Bool {
-        return lhs.testProperty == rhs.testProperty
-    }
-}